Commit 1c5ca50c218678f41b888b392a7fa31aedb76ef1
1 parent
8f7ed098
Commit Changes
Showing
1 changed file
with
10 additions
and
5 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
... | ... | @@ -360,7 +360,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou |
360 | 360 | }) |
361 | 361 | |
362 | 362 | $scope.showAllPins = function () { |
363 | - | |
363 | + | |
364 | 364 | $scope.allPinDataArray = []; |
365 | 365 | var promise = ModuleService.getPinDataForImage($rootScope.imageName) |
366 | 366 | .then( |
... | ... | @@ -1431,7 +1431,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou |
1431 | 1431 | } |
1432 | 1432 | |
1433 | 1433 | $scope.showAllPinsAfterHide = function (event) { |
1434 | - | |
1434 | + | |
1435 | 1435 | $rootScope.isLoading = true; |
1436 | 1436 | $('#spinner').css('visibility', 'visible'); |
1437 | 1437 | |
... | ... | @@ -1450,6 +1450,11 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou |
1450 | 1450 | $(".tooltip-custom").removeClass("btn-primary"); |
1451 | 1451 | $(".tooltip-custom").addClass("btn-black"); |
1452 | 1452 | $("#allPinBtn").addClass("btn-primary"); |
1453 | + if ($scope.isSliderChange == true) { | |
1454 | + $scope.isSliderChange = false; | |
1455 | + $scope.showAllPins(); | |
1456 | + | |
1457 | + } | |
1453 | 1458 | }; |
1454 | 1459 | |
1455 | 1460 | |
... | ... | @@ -1957,20 +1962,20 @@ $(document).ready(function () { |
1957 | 1962 | $('#' + btnID).addClass("btn-primary"); |
1958 | 1963 | } |
1959 | 1964 | }); |
1965 | + | |
1960 | 1966 | switch (btnID) { |
1961 | 1967 | |
1962 | 1968 | case "hidePinBtn": |
1963 | - | |
1964 | 1969 | break; |
1965 | 1970 | case "allPinBtn": |
1966 | - scope.showAllPins(); | |
1971 | + scope.showAllPins(); | |
1967 | 1972 | break; |
1968 | 1973 | case "selectedPin": |
1969 | 1974 | scope.showAllPins(); |
1970 | 1975 | setTimeout(function () { |
1971 | 1976 | console.log(scope.allPinDataArray); |
1972 | 1977 | scope.activePinOnSliderChange(); |
1973 | - }, 2000); | |
1978 | + }, 1000); | |
1974 | 1979 | break; |
1975 | 1980 | } |
1976 | 1981 | } | ... | ... |