ADAM / AIAHTML5

Commit 8cf2a152e1de954bc491da079f234d6dd8181c52

Authored by Nikita Kulshreshtha
1 parent 932e4098

fixed. loading icon will be visible on;y when selected view or gender is not the current one.

Inline Side-by-side
Showing 1 changed file with 10 additions and 5 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @8cf2a15
@@ -5889,8 +5889,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -5889,8 +5889,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5889 5889
5890 // $rootScope.isHighlightBodyByBodySystem = false; 5890 // $rootScope.isHighlightBodyByBodySystem = false;
5891 5891
5892 - $rootScope.isLoading = true;  
5893 - $('#spinner').css('visibility', 'visible'); 5892 +
5894 5893
5895 $rootScope.isGenderChnage = true; 5894 $rootScope.isGenderChnage = true;
5896 5895
@@ -5905,6 +5904,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -5905,6 +5904,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5905 //2 first update the currentbodyviewid in local storage 5904 //2 first update the currentbodyviewid in local storage
5906 localStorage.setItem("currentBodyViewId", currentBodyViewId); 5905 localStorage.setItem("currentBodyViewId", currentBodyViewId);
5907 5906
  5907 + $rootScope.isLoading = true;
  5908 + $('#spinner').css('visibility', 'visible');
5908 //3. 5909 //3.
5909 $scope.layerNumber = 0; 5910 $scope.layerNumber = 0;
5910 $scope.loadSelectedBodyView(currentBodyViewId); 5911 $scope.loadSelectedBodyView(currentBodyViewId);
@@ -5933,6 +5934,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -5933,6 +5934,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5933 //2. first update the currentbodyviewid in local storage 5934 //2. first update the currentbodyviewid in local storage
5934 localStorage.setItem("currentBodyViewId", currentBodyViewId); 5935 localStorage.setItem("currentBodyViewId", currentBodyViewId);
5935 5936
  5937 + $rootScope.isLoading = true;
  5938 + $('#spinner').css('visibility', 'visible');
5936 //3. 5939 //3.
5937 $scope.layerNumber = 0; 5940 $scope.layerNumber = 0;
5938 $scope.loadSelectedBodyView(currentBodyViewId); 5941 $scope.loadSelectedBodyView(currentBodyViewId);
@@ -6091,9 +6094,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -6091,9 +6094,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6091 // $rootScope.isHighlightBodyByBodySystem = false; 6094 // $rootScope.isHighlightBodyByBodySystem = false;
6092 6095
6093 6096
6094 - $rootScope.isLoading = true;  
6095 - $('#spinner').css('visibility', 'visible');  
6096 -  
6097 6097
6098 if ($rootScope.openViews.length > 0) { 6098 if ($rootScope.openViews.length > 0) {
6099 $rootScope.openViews.splice($rootScope.openViews.length - 1); 6099 $rootScope.openViews.splice($rootScope.openViews.length - 1);
@@ -6116,6 +6116,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -6116,6 +6116,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6116 $rootScope.voId = selectedViewId; 6116 $rootScope.voId = selectedViewId;
6117 $rootScope.isLoading = true; 6117 $rootScope.isLoading = true;
6118 6118
  6119 + $rootScope.isLoading = true;
  6120 + $('#spinner').css('visibility', 'visible');
  6121 +
6119 //1. first update the currentbodyviewid in local storage 6122 //1. first update the currentbodyviewid in local storage
6120 localStorage.setItem("currentBodyViewId", $rootScope.voId); 6123 localStorage.setItem("currentBodyViewId", $rootScope.voId);
6121 6124
@@ -6151,6 +6154,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -6151,6 +6154,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6151 $rootScope.voId = selectedViewId; 6154 $rootScope.voId = selectedViewId;
6152 $rootScope.isLoading = true; 6155 $rootScope.isLoading = true;
6153 6156
  6157 + $rootScope.isLoading = true;
  6158 + $('#spinner').css('visibility', 'visible');
6154 //1. 6159 //1.
6155 $scope.loadSelectedBodyView($rootScope.voId); 6160 $scope.loadSelectedBodyView($rootScope.voId);
6156 6161