From 65a6a6110500a3a3dc8d86bdf178c45ed4f57990 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 9 Oct 2017 18:12:49 +0530 Subject: [PATCH] Bug #23641: File > Print Preview > Atlas Anatomy > Body system's pins appear on the Print preview page. --- 400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js | 7 +++++++ 400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js | 15 +++++++++++---- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js index 1d39758..42ae799 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js @@ -4300,6 +4300,13 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic } } }); + + if ($location.url() == "/module-item-view") { + $timeout(function () { + $rootScope.hidePins(); + }, 100); + } + }; function OpenJSPanel() { diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js index d174efb..8c9e7e7 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js @@ -304,6 +304,13 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou $rootScope.searchSelectedText = ''; }); + + $(document).on("click", "#dvPrintPreview .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-close .jsglyph-remove", function () { + + $scope.showAllPinsAfterHide(); + + }); + }) $rootScope.aaPinDataArray = []; $scope.showAllPins = function () { @@ -1338,7 +1345,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou } } - $scope.hidePins = function () { + $rootScope.hidePins = function () { $rootScope.isLoading = true; $('#spinner').css('visibility', 'visible'); @@ -1717,9 +1724,9 @@ function showSelectedSystemPins(event) { function hidePins(event) { - var scope = angular.element(document.getElementById("aaDetailPageDiv")).scope(); - scope.$apply(function () { - scope.hidePins(event); + var rootScope = angular.element(document.getElementById("aaDetailPageDiv")).scope(); + rootScope.$apply(function () { + rootScope.hidePins(event); }); } -- libgit2 0.21.4