ADAM / AIAHTML5

Commit 65a6a6110500a3a3dc8d86bdf178c45ed4f57990

Authored by unknown
1 parent 7f3f710c

Bug #23641: File > Print Preview > Atlas Anatomy > Body system's pins appear on … 

…the Print preview page.
Inline Side-by-side
Showing 2 changed files with 18 additions and 4 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @65a6a61
... ... @@ -4300,6 +4300,13 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
4300 4300 }
4301 4301 }
4302 4302 });
  4303 +
  4304 + if ($location.url() == "/module-item-view") {
  4305 + $timeout(function () {
  4306 + $rootScope.hidePins();
  4307 + }, 100);
  4308 + }
  4309 +
4303 4310 };
4304 4311  
4305 4312 function OpenJSPanel() {
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
  View file @65a6a61
... ... @@ -304,6 +304,13 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
304 304 $rootScope.searchSelectedText = '';
305 305  
306 306 });
  307 +
  308 + $(document).on("click", "#dvPrintPreview .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-close .jsglyph-remove", function () {
  309 +
  310 + $scope.showAllPinsAfterHide();
  311 +
  312 + });
  313 +
307 314 })
308 315 $rootScope.aaPinDataArray = [];
309 316 $scope.showAllPins = function () {
... ... @@ -1338,7 +1345,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1338 1345 }
1339 1346 }
1340 1347  
1341   - $scope.hidePins = function () {
  1348 + $rootScope.hidePins = function () {
1342 1349  
1343 1350 $rootScope.isLoading = true;
1344 1351 $('#spinner').css('visibility', 'visible');
... ... @@ -1717,9 +1724,9 @@ function showSelectedSystemPins(event) {
1717 1724  
1718 1725 function hidePins(event) {
1719 1726  
1720   - var scope = angular.element(document.getElementById("aaDetailPageDiv")).scope();
1721   - scope.$apply(function () {
1722   - scope.hidePins(event);
  1727 + var rootScope = angular.element(document.getElementById("aaDetailPageDiv")).scope();
  1728 + rootScope.$apply(function () {
  1729 + rootScope.hidePins(event);
1723 1730 });
1724 1731 }
1725 1732  
... ...