ADAM / AIAHTML5

Commit 8f0a2655c9d18a18afe9ed85aa7cdfa567dfba3a

Authored by Nikita Kulshreshtha
2 parents b6dec0d1 fbb97802

Merge branch 'QA-IPAD-MAC' into Develop-IPAD-MAC

Inline Side-by-side
Showing 1 changed file with 15 additions and 2 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @8f0a265
... ... @@ -276,6 +276,12 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
276 276 };
277 277  
278 278 $scope.DisableUI = function () {
  279 +
  280 + //enable daBodyViewDiv which was disabled on thumbnail click so need not bother where to enable
  281 + //as jspanel disable/enable is working for all features
  282 + document.getElementById('daBodyview').style.pointerEvents = "auto";
  283 + document.getElementById('daBodyview').style.opacity = "1";
  284 +
279 285 var daImagePanelConetent = document.getElementsByClassName("jsPanel-content");
280 286 for (var i = 0; i < daImagePanelConetent.length; i++) {
281 287 daImagePanelConetent[i].style.pointerEvents = "none";
... ... @@ -299,8 +305,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
299 305 }
300 306  
301 307 $scope.openView = function ($event) {
302   - $scope.DisableUI();
303   -
  308 +
304 309 $rootScope.disableAnnotationTB = false;
305 310 $rootScope.MenuModuleName = "DA";
306 311 $rootScope.isLoading = true;
... ... @@ -316,6 +321,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
316 321 var u = $location.url();
317 322 $location.url('/da-body-view');
318 323  
  324 +
  325 +
319 326 var view_list = angular.element($event.currentTarget);
320 327 var view_list_male_female = view_list.attr('title');
321 328  
... ... @@ -459,6 +466,12 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
459 466 //da-body-views functions
460 467  
461 468 $scope.openBodyView = function () {
  469 +
  470 + //disable whole div because till now jspanel is not created. enable when jspanel gets disabled because
  471 + //than jspanel will take care of disabling/enabling ui
  472 + document.getElementById('daBodyview').style.pointerEvents = "none";
  473 + document.getElementById('daBodyview').style.opacity = "0.5";
  474 +
462 475 //Check if browser 'REFRESHED' or 'RELOADED'
463 476 if ($rootScope.CommonData != null) {
464 477 //0. we will initially append container to load body
... ...