Commit fbb97802712adc0e2d3fd2fb3f4959ac5f1c957b
Merge branch 'Develop' into QA
Showing
1 changed file
with
15 additions
and
2 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
| @@ -276,6 +276,12 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l | @@ -276,6 +276,12 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l | ||
| 276 | }; | 276 | }; |
| 277 | 277 | ||
| 278 | $scope.DisableUI = function () { | 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 | var daImagePanelConetent = document.getElementsByClassName("jsPanel-content"); | 285 | var daImagePanelConetent = document.getElementsByClassName("jsPanel-content"); |
| 280 | for (var i = 0; i < daImagePanelConetent.length; i++) { | 286 | for (var i = 0; i < daImagePanelConetent.length; i++) { |
| 281 | daImagePanelConetent[i].style.pointerEvents = "none"; | 287 | daImagePanelConetent[i].style.pointerEvents = "none"; |
| @@ -299,8 +305,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l | @@ -299,8 +305,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l | ||
| 299 | } | 305 | } |
| 300 | 306 | ||
| 301 | $scope.openView = function ($event) { | 307 | $scope.openView = function ($event) { |
| 302 | - $scope.DisableUI(); | ||
| 303 | - | 308 | + |
| 304 | $rootScope.disableAnnotationTB = false; | 309 | $rootScope.disableAnnotationTB = false; |
| 305 | $rootScope.MenuModuleName = "DA"; | 310 | $rootScope.MenuModuleName = "DA"; |
| 306 | $rootScope.isLoading = true; | 311 | $rootScope.isLoading = true; |
| @@ -316,6 +321,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l | @@ -316,6 +321,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l | ||
| 316 | var u = $location.url(); | 321 | var u = $location.url(); |
| 317 | $location.url('/da-body-view'); | 322 | $location.url('/da-body-view'); |
| 318 | 323 | ||
| 324 | + | ||
| 325 | + | ||
| 319 | var view_list = angular.element($event.currentTarget); | 326 | var view_list = angular.element($event.currentTarget); |
| 320 | var view_list_male_female = view_list.attr('title'); | 327 | var view_list_male_female = view_list.attr('title'); |
| 321 | 328 | ||
| @@ -456,6 +463,12 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l | @@ -456,6 +463,12 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l | ||
| 456 | //da-body-views functions | 463 | //da-body-views functions |
| 457 | 464 | ||
| 458 | $scope.openBodyView = function () { | 465 | $scope.openBodyView = function () { |
| 466 | + | ||
| 467 | + //disable whole div because till now jspanel is not created. enable when jspanel gets disabled because | ||
| 468 | + //than jspanel will take care of disabling/enabling ui | ||
| 469 | + document.getElementById('daBodyview').style.pointerEvents = "none"; | ||
| 470 | + document.getElementById('daBodyview').style.opacity = "0.5"; | ||
| 471 | + | ||
| 459 | //Check if browser 'REFRESHED' or 'RELOADED' | 472 | //Check if browser 'REFRESHED' or 'RELOADED' |
| 460 | if ($rootScope.CommonData != null) { | 473 | if ($rootScope.CommonData != null) { |
| 461 | //0. we will initially append container to load body | 474 | //0. we will initially append container to load body |