loading icon was not visible on search and LM - Fixed.

Nikita Kulshreshtha
1 parent 71b6f72b
Showing 2 changed files with 14 additions and 13 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -1459,10 +1459,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                     {
                         if ($rootScope.isHighLight == true || ($rootScope.isListManagerSelected == true) || (($rootScope.isGenderChnage == true) && ($rootScope.isHighLight == true)) || (($rootScope.isViewChange == true) && ($rootScope.isHighLight == true))) {
-                            $rootScope.isLoading = false;
-                            $('#spinner').css('visibility', 'hidden');
-
-
                             $rootScope.isLoading = true;
                             $('#spinner').css('visibility', 'visible');
                             //$timeout(function () {
@@ -1785,13 +1781,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                             if ($rootScope.isHighLight == true || ($rootScope.isListManagerSelected == true) || (($rootScope.isGenderChnage == true) && ($rootScope.isHighLight == true)) || (($rootScope.isViewChange == true) && ($rootScope.isHighLight == true))) {
-                                $rootScope.isLoading = false;
-                                $('#spinner').css('visibility', 'hidden');
-
                                 $rootScope.isLoading = true;
                                 $('#spinner').css('visibility', 'visible');
-                                //$timeout(function () {
+                               
                                 console.log('inside start of non flipped. $scope.ColoredImageSRC.length= ' + $scope.ColoredImageSRC.length)
                                 $rootScope.isHighLight = true;
@@ -1800,7 +1793,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                                 $scope.highLightBody();
                                 console.log('just after highLightBody call');
-                                //}, 500);
+                                
                             }
                         }
                     }
@@ -2059,6 +2052,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         //    $rootScope.updatedGrayDataList = null;
         //    $rootScope.updatedGrayDataList = [];
         //}
+        $rootScope.isLoading = true;
+        $('#spinner').css('visibility', 'visible');
+
         if ($rootScope.isHighLight == true) {
             false;
@@ -5033,6 +5029,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     $scope.highLightBody = function () {
+        $rootScope.isLoading = true;
+        $('#spinner').css('visibility', 'visible');
+
         $scope.Normal = "";
         $scope.Extract = "";
         $scope.Highlight = "LeftButtonsDefaultState";
@@ -7173,7 +7172,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     $scope.jumpToTerm = function (event) {
-      
+        $rootScope.isLoading = true;
+
+        $('#spinner').css('visibility', 'visible');
         //1.
         $scope.searchFilter = event.currentTarget.innerHTML;
@@ -7322,13 +7323,13 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                 var $el = $('<option ng-click=HighlightBodyOnListManagerSelection($event) id=' + $scope.VocabTermTxt[j]._ActualTermNumber + '>' + $scope.VocabTermTxt[j]._TermText + '</option>').appendTo('#termList')
                 $compile($el)($scope);
+                $rootScope.isLoading = false;
+                $('#spinner').css('visibility', 'hidden');
             }
             var termsTotal = '<span class="pull-left marginTop5">' + $scope.VocabTermTxt.length + ' Structures</span>';
             $("#totalTerms").empty();
             $('#totalTerms').append(termsTotal);
-            $rootScope.isLoading = false;
-            $('#spinner').css('visibility', 'hidden');
         }
       }
@@ -444,7 +444,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
             $rootScope.isLoading = false;
             $('#spinner').css('visibility', 'hidden');
-            $('#spinner').css('display', 'none');
+            //$('#spinner').css('display', 'none');
             // $rootScope.isAnnotationWindowClose = true;
             //  if('#termList')
             if ($('#termList option').length > 0) {