Manual Merge for bug 24987

Amrita Vishnoi
2 parents bd06ffaa ed3ab632
Showing 2 changed files with 15 additions and 3 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
@@ -1358,7 +1358,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
     }
  
     $rootScope.hidePins = function () {
-        $rootScope.isshowAllPinsBtnAfterHideClicked = false;
+        $("#dropdownMenu221").addClass("aaSystemDisable");
         $rootScope.isLoading = true;
         $('#spinner').css('visibility', 'visible');
         $scope.hideSpeechBubble();
@@ -1387,6 +1387,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
     }
  
     $scope.showAllPinsAfterHide = function (event) {
+        if ($("#dropdownMenu221").hasClass("aaSystemDisable")) {
+            $("#dropdownMenu221").removeClass("aaSystemDisable");
+        }
         $rootScope.isLoading = true;
         $('#spinner').css('visibility', 'visible');
         $scope.isHidePinBtnClicked = false;
@@ -1413,7 +1416,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
  
  
     $scope.showSelectedPins = function () {
-        $rootScope.isshowAllPinsBtnAfterHideClicked = false;
+        if ($("#dropdownMenu221").hasClass("aaSystemDisable")) {
+            $("#dropdownMenu221").removeClass("aaSystemDisable");
+        }
         $rootScope.isLoading = true;
         $('#spinner').css('visibility', 'visible');
  
@@ -1104,4 +1104,11 @@ li[disabled], a[disabled] {
 }
 a[disabled] {
     color: #aaa !important; 
-}
 \ No newline at end of file
+}
+
+		
+.aaSystemDisable
+ {
+    pointer-events : none;
+    opacity : 0.5;
+}