From 8cf2a152e1de954bc491da079f234d6dd8181c52 Mon Sep 17 00:00:00 2001 From: nikita Date: Wed, 19 Oct 2016 18:16:48 +0530 Subject: [PATCH] fixed. loading icon will be visible on;y when selected view or gender is not the current one. --- 400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index 5773d97..7669cbe 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -5889,8 +5889,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo // $rootScope.isHighlightBodyByBodySystem = false; - $rootScope.isLoading = true; - $('#spinner').css('visibility', 'visible'); + $rootScope.isGenderChnage = true; @@ -5905,6 +5904,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo //2 first update the currentbodyviewid in local storage localStorage.setItem("currentBodyViewId", currentBodyViewId); + $rootScope.isLoading = true; + $('#spinner').css('visibility', 'visible'); //3. $scope.layerNumber = 0; $scope.loadSelectedBodyView(currentBodyViewId); @@ -5933,6 +5934,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo //2. first update the currentbodyviewid in local storage localStorage.setItem("currentBodyViewId", currentBodyViewId); + $rootScope.isLoading = true; + $('#spinner').css('visibility', 'visible'); //3. $scope.layerNumber = 0; $scope.loadSelectedBodyView(currentBodyViewId); @@ -6091,9 +6094,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo // $rootScope.isHighlightBodyByBodySystem = false; - $rootScope.isLoading = true; - $('#spinner').css('visibility', 'visible'); - if ($rootScope.openViews.length > 0) { $rootScope.openViews.splice($rootScope.openViews.length - 1); @@ -6116,6 +6116,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $rootScope.voId = selectedViewId; $rootScope.isLoading = true; + $rootScope.isLoading = true; + $('#spinner').css('visibility', 'visible'); + //1. first update the currentbodyviewid in local storage localStorage.setItem("currentBodyViewId", $rootScope.voId); @@ -6151,6 +6154,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $rootScope.voId = selectedViewId; $rootScope.isLoading = true; + $rootScope.isLoading = true; + $('#spinner').css('visibility', 'visible'); //1. $scope.loadSelectedBodyView($rootScope.voId); -- libgit2 0.21.4