Commit 168aa89c8e7f64242b2029d69d6e077120cbf23d
1 parent
e1e05093
After list manager load removed the wait cursor.
Showing
2 changed files
with
7 additions
and
2 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -7321,13 +7321,14 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -7321,13 +7321,14 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
7321 | for (var j = 0; j < $scope.VocabTermTxt.length; j++) { | 7321 | for (var j = 0; j < $scope.VocabTermTxt.length; j++) { |
7322 | var $el = $('<option ng-click=HighlightBodyOnListManagerSelection($event) id=' + $scope.VocabTermTxt[j]._ActualTermNumber + '>' + $scope.VocabTermTxt[j]._TermText + '</option>').appendTo('#termList') | 7322 | var $el = $('<option ng-click=HighlightBodyOnListManagerSelection($event) id=' + $scope.VocabTermTxt[j]._ActualTermNumber + '>' + $scope.VocabTermTxt[j]._TermText + '</option>').appendTo('#termList') |
7323 | $compile($el)($scope); | 7323 | $compile($el)($scope); |
7324 | - $rootScope.isLoading = false; | ||
7325 | - $('#spinner').css('visibility', 'hidden'); | 7324 | + |
7326 | } | 7325 | } |
7327 | var termsTotal = '<span class="pull-left marginTop5">' + $scope.VocabTermTxt.length + ' Structures</span>'; | 7326 | var termsTotal = '<span class="pull-left marginTop5">' + $scope.VocabTermTxt.length + ' Structures</span>'; |
7328 | $("#totalTerms").empty(); | 7327 | $("#totalTerms").empty(); |
7329 | $('#totalTerms').append(termsTotal); | 7328 | $('#totalTerms').append(termsTotal); |
7330 | 7329 | ||
7330 | + $rootScope.isLoading = false; | ||
7331 | + $('#spinner').css('visibility', 'hidden'); | ||
7331 | 7332 | ||
7332 | } | 7333 | } |
7333 | } | 7334 | } |
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -441,6 +441,10 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", | @@ -441,6 +441,10 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", | ||
441 | //$rootScope.isListManagerSelected = false; | 441 | //$rootScope.isListManagerSelected = false; |
442 | $('#listManager').css('display', 'none'); | 442 | $('#listManager').css('display', 'none'); |
443 | $("#listManager").css("visibility", "hidden"); | 443 | $("#listManager").css("visibility", "hidden"); |
444 | + | ||
445 | + $rootScope.isLoading = false; | ||
446 | + $('#spinner').css('visibility', 'hidden'); | ||
447 | + $('#spinner').css('display', 'none'); | ||
444 | // $rootScope.isAnnotationWindowClose = true; | 448 | // $rootScope.isAnnotationWindowClose = true; |
445 | // if('#termList') | 449 | // if('#termList') |
446 | if ($('#termList option').length > 0) { | 450 | if ($('#termList option').length > 0) { |