merged 25035

Nikita Kulshreshtha
2 parents a2f46b0a 688d144e
Showing 2 changed files with 21 additions and 28 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
400-SOURCECODE/AIAHTML5.Web/themes/default/scripts/bootstrap/3.3.5/bootstrap.js
@@ -435,8 +435,8 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
  
     })
     $rootScope.aaPinDataArray = [];
+    $rootScope.isShowSelectedSystemPinsClicked = false;
     $scope.showAllPins = function () {
-       
         $scope.allPinDataArray = [];
         var promise = ModuleService.getPinDataForImage($rootScope.imageName)
  
@@ -462,19 +462,27 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
                         $scope.allPinDataArray.push(value._PinId);
                         $scope.drawStaticPinsOnImage('aaDetailViewCanvas', value._PinId, value._PinX, value._PinY, value._HeadX, value._HeadY)
                     })
-
-
-                    
-                    //load search/vocab data
+                   
+                   
+                    if ($rootScope.isShowSelectedSystemPinsClicked == false) {
+                        $rootScope.isShowSelectedSystemPinsClicked = true;
+                        //load search/vocab data
                     if ($rootScope.isSliderSlide == true) {
  
                         $rootScope.isSliderSlide = false;
  
                     }
                     else {
-                        $rootScope.loadSearchData();
+                        $rootScope.loadSearchData();    
  
                     }
+                    }
+                    else {
+                        $rootScope.isLoading = false;
+                        $('#spinner').css('visibility', 'hidden');
+                    }
+
+                  
                 }
             },
              function (error) {
@@ -696,6 +704,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
     }
  
     $scope.showSelectedSystemPins = function (event) {
+        $rootScope.isShowSelectedSystemPinsClicked = true;
         var bodySystemListObj = document.getElementById("bodySystemList").getElementsByTagName("a");
         var bodySystemListlength = bodySystemListObj.length;
         for (var i = 0; i < bodySystemListlength; i++) {
@@ -491,7 +491,7 @@ if (typeof jQuery === &#39;undefined&#39;) {
   var backdrop = '.dropdown-backdrop'
   var toggle   = '[data-toggle="dropdown"]'
   var Dropdown = function (element) {
-    $(element).on('click.bs.dropdown', this.toggle)
+      $(element).on('click.bs.dropdown', this.toggle);
   }
  
   Dropdown.VERSION = '3.3.6'
@@ -629,28 +629,12 @@ if (typeof jQuery === &#39;undefined&#39;) {
  
   // APPLY TO STANDARD DROPDOWN ELEMENTS
   // ===================================
-  var $ua = navigator.userAgent;
-  if (($ua.match(/(iPod|iPhone|iPad)/i))) {
   $(document)
-       .on('click.bs.dropdown.data-api', clearMenus)
-       .on('click.bs.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
-       .on('click.bs.dropdown.data-api', toggle, Dropdown.prototype.toggle)
-       .on('touchstart.bs.dropdown.data-api', clearMenus)
-       .on('touchstart.bs.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
-       .on('touchstart.bs.dropdown.data-api', toggle, Dropdown.prototype.toggle)
-       .on('keydown.bs.dropdown.data-api', toggle, Dropdown.prototype.keydown)
-       .on('keydown.bs.dropdown.data-api', '.dropdown-menu', Dropdown.prototype.keydown)
-}
-else
-{
-        $(document)
-      .on('click.bs.dropdown.data-api', clearMenus)
-      .on('click.bs.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
-      .on('click.bs.dropdown.data-api', toggle, Dropdown.prototype.toggle)
-      .on('keydown.bs.dropdown.data-api', toggle, Dropdown.prototype.keydown)
-      .on('keydown.bs.dropdown.data-api', '.dropdown-menu', Dropdown.prototype.keydown)
-}
-
+     .on('click.bs.dropdown.data-api', clearMenus)
+     .on('click.bs.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
+     .on('click.bs.dropdown.data-api', toggle, Dropdown.prototype.toggle)
+     .on('keydown.bs.dropdown.data-api', toggle, Dropdown.prototype.keydown)
+     .on('keydown.bs.dropdown.data-api', '.dropdown-menu', Dropdown.prototype.keydown)
 }(jQuery);
  
 /* ========================================================================