From 85c71e469c6629d3acc782bf0687289a7f069bc3 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 10 Oct 2017 12:42:53 +0530 Subject: [PATCH] Commit Changes --- 400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js index 8c9e7e7..e0a55c4 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js @@ -307,14 +307,25 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou $(document).on("click", "#dvPrintPreview .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-close .jsglyph-remove", function () { - $scope.showAllPinsAfterHide(); - + if ($rootScope.isShowAllPinBtnActiveInPrintPreviewMode == true) { + $("#allPinBtn").trigger("click"); + $rootScope.isShowAllPinBtnActiveInPrintPreviewMode = false; + } + if ($rootScope.isHidePinBtnActiveInPrintPreview == true) { + $("#hidePinBtn").trigger("click"); + $rootScope.isHidePinBtnActiveInPrintPreview = false; + } + if($rootScope.isShowSelectedPinActiveInPrintPrevMode == true) + { + $("#selectedPin").trigger("click"); + $rootScope.isShowSelectedPinActiveInPrintPrevMode = false; + } }); }) $rootScope.aaPinDataArray = []; $scope.showAllPins = function () { - + $scope.allPinDataArray = []; var promise = ModuleService.getPinDataForImage($rootScope.imageName) @@ -1349,7 +1360,6 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou $rootScope.isLoading = true; $('#spinner').css('visibility', 'visible'); - $scope.hideSpeechBubble(); $scope.isHidePinBtnClicked = true; @@ -1376,12 +1386,8 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou } $scope.showAllPinsAfterHide = function (event) { - - $rootScope.isLoading = true; $('#spinner').css('visibility', 'visible'); - - $scope.isHidePinBtnClicked = false; if ($scope.selectedSystemName != null && $scope.selectedSystemName != undefined) { @@ -1406,7 +1412,6 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou $scope.showSelectedPins = function () { - $rootScope.isLoading = true; $('#spinner').css('visibility', 'visible'); -- libgit2 0.21.4