diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js index bd7a254..ef5a829 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js @@ -360,7 +360,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou }) $scope.showAllPins = function () { - + $scope.allPinDataArray = []; var promise = ModuleService.getPinDataForImage($rootScope.imageName) .then( @@ -1431,7 +1431,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou } $scope.showAllPinsAfterHide = function (event) { - + $rootScope.isLoading = true; $('#spinner').css('visibility', 'visible'); @@ -1450,6 +1450,11 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou $(".tooltip-custom").removeClass("btn-primary"); $(".tooltip-custom").addClass("btn-black"); $("#allPinBtn").addClass("btn-primary"); + if ($scope.isSliderChange == true) { + $scope.isSliderChange = false; + $scope.showAllPins(); + + } }; @@ -1957,20 +1962,20 @@ $(document).ready(function () { $('#' + btnID).addClass("btn-primary"); } }); + switch (btnID) { case "hidePinBtn": - break; case "allPinBtn": - scope.showAllPins(); + scope.showAllPins(); break; case "selectedPin": scope.showAllPins(); setTimeout(function () { console.log(scope.allPinDataArray); scope.activePinOnSliderChange(); - }, 2000); + }, 1000); break; } }