ADAM / AIAHTML5

Commit 47490a04afa68fcaa7fa258c65c23becd371e185

Authored by Nikita Kulshreshtha
2 parents 1096aae3 8097e01d

Merge branch 'loaderIssueAAIE' into Develop-IPAD-MAC

Inline Side-by-side
Showing 1 changed file with 5 additions and 0 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
  View file @47490a0
@@ -55,6 +55,8 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou @@ -55,6 +55,8 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
55 }; 55 };
56 56
57 $scope.loadForModuleById = function (moduleId) { 57 $scope.loadForModuleById = function (moduleId) {
  58 + $rootScope.isLoading = true;
  59 + $('#spinner').css('visibility', 'visible');
58 $rootScope.openModules.push({ "ModuleId": 2 }); 60 $rootScope.openModules.push({ "ModuleId": 2 });
59 if ($rootScope.refreshcheck == null) { 61 if ($rootScope.refreshcheck == null) {
60 $location.path('/'); 62 $location.path('/');
@@ -80,7 +82,10 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou @@ -80,7 +82,10 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
80 } 82 }
81 if ($rootScope.getLocalStorageValue('AAGridViewScroll') !== null && $location.url() == "/tile-view-list") { 83 if ($rootScope.getLocalStorageValue('AAGridViewScroll') !== null && $location.url() == "/tile-view-list") {
82 $('html, body').animate({ scrollTop: $rootScope.getLocalStorageValue('AAGridViewScroll') }, 'slow'); 84 $('html, body').animate({ scrollTop: $rootScope.getLocalStorageValue('AAGridViewScroll') }, 'slow');
  85 +
83 } 86 }
  87 + $rootScope.isLoading = false;
  88 + $('#spinner').css('visibility', 'hidden');
84 }, 100); 89 }, 100);
85 //console.log(JSON.stringify(result, null, 4)); 90 //console.log(JSON.stringify(result, null, 4));
86 }, 91 },