Commit b7b68093f1ae9358091a53548c0c587dac094893
1 parent
03846261
DA load issue on high resolution MAC
Showing
1 changed file
with
12 additions
and
8 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
| @@ -475,8 +475,11 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l | @@ -475,8 +475,11 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l | ||
| 475 | 475 | ||
| 476 | //disable whole div because till now jspanel is not created. enable when jspanel gets disabled because | 476 | //disable whole div because till now jspanel is not created. enable when jspanel gets disabled because |
| 477 | //than jspanel will take care of disabling/enabling ui | 477 | //than jspanel will take care of disabling/enabling ui |
| 478 | - document.getElementById('daBodyview').style.pointerEvents = "none"; | ||
| 479 | - document.getElementById('daBodyview').style.opacity = "0.5"; | 478 | + |
| 479 | + if (document.getElementById('daBodyview') != null) { | ||
| 480 | + document.getElementById('daBodyview').style.pointerEvents = "none"; | ||
| 481 | + document.getElementById('daBodyview').style.opacity = "0.5"; | ||
| 482 | + } | ||
| 480 | 483 | ||
| 481 | //Check if browser 'REFRESHED' or 'RELOADED' | 484 | //Check if browser 'REFRESHED' or 'RELOADED' |
| 482 | if ($rootScope.CommonData != null) { | 485 | if ($rootScope.CommonData != null) { |
| @@ -507,7 +510,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l | @@ -507,7 +510,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l | ||
| 507 | 510 | ||
| 508 | $rootScope.loadSearchData(); | 511 | $rootScope.loadSearchData(); |
| 509 | 512 | ||
| 510 | - console.log('currentBodyViewId pickjed from localStorage: ' + currentBodyViewId); | 513 | + console.log('currentBodyViewId picked from localStorage: ' + currentBodyViewId); |
| 511 | 514 | ||
| 512 | var openViews; | 515 | var openViews; |
| 513 | if ($rootScope.openViews != null || $rootScope.openViews != undefined) { | 516 | if ($rootScope.openViews != null || $rootScope.openViews != undefined) { |
| @@ -584,15 +587,15 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l | @@ -584,15 +587,15 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l | ||
| 584 | console.log('html is compiled ' + document.getElementById('daView')) | 587 | console.log('html is compiled ' + document.getElementById('daView')) |
| 585 | 588 | ||
| 586 | if (document.getElementById('daView') != null) { | 589 | if (document.getElementById('daView') != null) { |
| 587 | - | ||
| 588 | - $scope.loadDAView(currentBodyViewId); | 590 | + $scope.loadDAView(currentBodyViewId); |
| 589 | } | 591 | } |
| 590 | else | 592 | else |
| 591 | { | 593 | { |
| 592 | - $compile(daBodyviewElement.contents())($scope); | 594 | + $("#daImagePanel .jsglyph-remove").click(); |
| 595 | + | ||
| 593 | console.log('html is compiled in else ' + document.getElementById('daView')) | 596 | console.log('html is compiled in else ' + document.getElementById('daView')) |
| 594 | 597 | ||
| 595 | - $scope.loadDAView(currentBodyViewId); | 598 | + |
| 596 | 599 | ||
| 597 | } | 600 | } |
| 598 | 601 | ||
| @@ -724,7 +727,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l | @@ -724,7 +727,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l | ||
| 724 | }); | 727 | }); |
| 725 | } | 728 | } |
| 726 | 729 | ||
| 727 | - $(document).on("click", "#daImagePanel .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-close .jsglyph-remove", function () { | 730 | + $(document).on("click", "#daImagePanel .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-close .jsglyph-remove", function () { |
| 731 | + | ||
| 728 | $rootScope.selectedBodySystemName = 'All'; | 732 | $rootScope.selectedBodySystemName = 'All'; |
| 729 | $rootScope.selectedBodySystemId = 0; | 733 | $rootScope.selectedBodySystemId = 0; |
| 730 | $rootScope.searchSelectedText = ''; | 734 | $rootScope.searchSelectedText = ''; |