ADAM / AIAHTML5

Commit 1e20167d1fddaec9b9c503c879c8ff8371f7cd72

Authored by Amrita Vishnoi
2 parents 2b3ceebc b9f366d0

Merge branch 'DAloadIssueOnHighResolutionMAC' into Develop-IPAD-MAC

Inline Side-by-side
Showing 1 changed file with 14 additions and 9 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @1e20167
@@ -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,16 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -584,15 +587,16 @@ 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 + // this is a work around solution for a bug where DA does not load for long and user need to close the DA partially opened
  595 + // view, now we are programmatically closing the hung view and when user will reopen the DA view from tile then it will
  596 + // open without any issue.
  597 + $("#daImagePanel .jsglyph-remove").click();
  598 +
593 console.log('html is compiled in else ' + document.getElementById('daView')) 599 console.log('html is compiled in else ' + document.getElementById('daView'))
594 -  
595 - $scope.loadDAView(currentBodyViewId);  
596 600
597 } 601 }
598 602
@@ -724,7 +728,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -724,7 +728,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
724 }); 728 });
725 } 729 }
726 730
727 - $(document).on("click", "#daImagePanel .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-close .jsglyph-remove", function () { 731 + $(document).on("click", "#daImagePanel .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-close .jsglyph-remove", function () {
  732 +
728 $rootScope.selectedBodySystemName = 'All'; 733 $rootScope.selectedBodySystemName = 'All';
729 $rootScope.selectedBodySystemId = 0; 734 $rootScope.selectedBodySystemId = 0;
730 $rootScope.searchSelectedText = ''; 735 $rootScope.searchSelectedText = '';