ADAM / AIAHTML5

Commit 76312e574ccdf62075c3c5f224e380ead075edd8

Authored by Nikita Kulshreshtha
1 parent 71b6f72b

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

Inline Side-by-side
Showing 2 changed files with 14 additions and 13 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @76312e5
... ... @@ -1459,10 +1459,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1459 1459 {
1460 1460 if ($rootScope.isHighLight == true || ($rootScope.isListManagerSelected == true) || (($rootScope.isGenderChnage == true) && ($rootScope.isHighLight == true)) || (($rootScope.isViewChange == true) && ($rootScope.isHighLight == true))) {
1461 1461  
1462   - $rootScope.isLoading = false;
1463   - $('#spinner').css('visibility', 'hidden');
1464   -
1465   -
1466 1462 $rootScope.isLoading = true;
1467 1463 $('#spinner').css('visibility', 'visible');
1468 1464 //$timeout(function () {
... ... @@ -1785,13 +1781,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1785 1781  
1786 1782 if ($rootScope.isHighLight == true || ($rootScope.isListManagerSelected == true) || (($rootScope.isGenderChnage == true) && ($rootScope.isHighLight == true)) || (($rootScope.isViewChange == true) && ($rootScope.isHighLight == true))) {
1787 1783  
1788   - $rootScope.isLoading = false;
1789   - $('#spinner').css('visibility', 'hidden');
1790   -
1791 1784  
1792 1785 $rootScope.isLoading = true;
1793 1786 $('#spinner').css('visibility', 'visible');
1794   - //$timeout(function () {
  1787 +
1795 1788 console.log('inside start of non flipped. $scope.ColoredImageSRC.length= ' + $scope.ColoredImageSRC.length)
1796 1789 $rootScope.isHighLight = true;
1797 1790  
... ... @@ -1800,7 +1793,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1800 1793 $scope.highLightBody();
1801 1794  
1802 1795 console.log('just after highLightBody call');
1803   - //}, 500);
  1796 +
1804 1797 }
1805 1798 }
1806 1799 }
... ... @@ -2059,6 +2052,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2059 2052 // $rootScope.updatedGrayDataList = null;
2060 2053 // $rootScope.updatedGrayDataList = [];
2061 2054 //}
  2055 + $rootScope.isLoading = true;
  2056 + $('#spinner').css('visibility', 'visible');
  2057 +
2062 2058  
2063 2059 if ($rootScope.isHighLight == true) {
2064 2060 false;
... ... @@ -5033,6 +5029,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5033 5029  
5034 5030 $scope.highLightBody = function () {
5035 5031  
  5032 + $rootScope.isLoading = true;
  5033 + $('#spinner').css('visibility', 'visible');
  5034 +
5036 5035 $scope.Normal = "";
5037 5036 $scope.Extract = "";
5038 5037 $scope.Highlight = "LeftButtonsDefaultState";
... ... @@ -7173,7 +7172,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
7173 7172  
7174 7173 $scope.jumpToTerm = function (event) {
7175 7174  
7176   -
  7175 + $rootScope.isLoading = true;
  7176 +
  7177 + $('#spinner').css('visibility', 'visible');
7177 7178 //1.
7178 7179 $scope.searchFilter = event.currentTarget.innerHTML;
7179 7180  
... ... @@ -7322,13 +7323,13 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
7322 7323 var $el = $('<option ng-click=HighlightBodyOnListManagerSelection($event) id=' + $scope.VocabTermTxt[j]._ActualTermNumber + '>' + $scope.VocabTermTxt[j]._TermText + '</option>').appendTo('#termList')
7323 7324 $compile($el)($scope);
7324 7325  
  7326 + $rootScope.isLoading = false;
  7327 + $('#spinner').css('visibility', 'hidden');
7325 7328 }
7326 7329 var termsTotal = '<span class="pull-left marginTop5">' + $scope.VocabTermTxt.length + ' Structures</span>';
7327 7330 $("#totalTerms").empty();
7328 7331 $('#totalTerms').append(termsTotal);
7329 7332  
7330   - $rootScope.isLoading = false;
7331   - $('#spinner').css('visibility', 'hidden');
7332 7333  
7333 7334 }
7334 7335 }
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @76312e5
... ... @@ -444,7 +444,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
444 444  
445 445 $rootScope.isLoading = false;
446 446 $('#spinner').css('visibility', 'hidden');
447   - $('#spinner').css('display', 'none');
  447 + //$('#spinner').css('display', 'none');
448 448 // $rootScope.isAnnotationWindowClose = true;
449 449 // if('#termList')
450 450 if ($('#termList option').length > 0) {
... ...