Commit 85c71e469c6629d3acc782bf0687289a7f069bc3

Authored by unknown
1 parent 38ca5649

Commit Changes

400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
... ... @@ -307,14 +307,25 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
307 307  
308 308 $(document).on("click", "#dvPrintPreview .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-close .jsglyph-remove", function () {
309 309  
310   - $scope.showAllPinsAfterHide();
311   -
  310 + if ($rootScope.isShowAllPinBtnActiveInPrintPreviewMode == true) {
  311 + $("#allPinBtn").trigger("click");
  312 + $rootScope.isShowAllPinBtnActiveInPrintPreviewMode = false;
  313 + }
  314 + if ($rootScope.isHidePinBtnActiveInPrintPreview == true) {
  315 + $("#hidePinBtn").trigger("click");
  316 + $rootScope.isHidePinBtnActiveInPrintPreview = false;
  317 + }
  318 + if($rootScope.isShowSelectedPinActiveInPrintPrevMode == true)
  319 + {
  320 + $("#selectedPin").trigger("click");
  321 + $rootScope.isShowSelectedPinActiveInPrintPrevMode = false;
  322 + }
312 323 });
313 324  
314 325 })
315 326 $rootScope.aaPinDataArray = [];
316 327 $scope.showAllPins = function () {
317   -
  328 +
318 329 $scope.allPinDataArray = [];
319 330 var promise = ModuleService.getPinDataForImage($rootScope.imageName)
320 331  
... ... @@ -1349,7 +1360,6 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1349 1360  
1350 1361 $rootScope.isLoading = true;
1351 1362 $('#spinner').css('visibility', 'visible');
1352   -
1353 1363 $scope.hideSpeechBubble();
1354 1364  
1355 1365 $scope.isHidePinBtnClicked = true;
... ... @@ -1376,12 +1386,8 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1376 1386 }
1377 1387  
1378 1388 $scope.showAllPinsAfterHide = function (event) {
1379   -
1380   -
1381 1389 $rootScope.isLoading = true;
1382 1390 $('#spinner').css('visibility', 'visible');
1383   -
1384   -
1385 1391 $scope.isHidePinBtnClicked = false;
1386 1392  
1387 1393 if ($scope.selectedSystemName != null && $scope.selectedSystemName != undefined) {
... ... @@ -1406,7 +1412,6 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1406 1412  
1407 1413  
1408 1414 $scope.showSelectedPins = function () {
1409   -
1410 1415 $rootScope.isLoading = true;
1411 1416 $('#spinner').css('visibility', 'visible');
1412 1417  
... ...