From 4767ef1e1902c8051e8cc25d247d5ced49f0e6bf Mon Sep 17 00:00:00 2001 From: nikita Date: Tue, 8 Nov 2016 16:26:04 +0530 Subject: [PATCH] now the highlighted body part is maintained on gender/ view change. --- 400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index 91a7384..ed65313 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -5632,7 +5632,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $('#spinner').css('visibility', 'visible'); $timeout(function () { $scope.HighlightBodyByTermList($scope.systemMatchedTermList) }, 100); } - else if ($rootScope.isListManagerSelected == true) { + else if (($rootScope.isListManagerSelected == true) || ($rootScope.previousHighlightList != null && $rootScope.previousHighlightList.length > 0) && ($rootScope.isGenderChnage==true || $rootScope.isViewChange==true)) { // console.log('$scope.grayedBR.length is ' + $scope.grayedBR.length); $timeout(function () { @@ -5927,13 +5927,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $rootScope.isLoading = true; $('#spinner').css('visibility', 'visible'); //3. - if ($rootScope.isHighLight == true && $rootScope.previousHighlightList != null && $rootScope.previousHighlightList.length > 0) { - $scope.setLayerNumberAndHighlightByTermList(); - } - else { + $scope.layerNumber = 0; $scope.loadSelectedBodyView(currentBodyViewId); - } + //4. $scope.loadSelectedBodyViewNavigator(currentBodyViewId); @@ -5962,13 +5959,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $rootScope.isLoading = true; $('#spinner').css('visibility', 'visible'); //3. - if ($rootScope.isHighLight == true && $rootScope.previousHighlightList != null && $rootScope.previousHighlightList.length > 0) { - $scope.setLayerNumberAndHighlightByTermList(); - } - else { + $scope.layerNumber = 0; $scope.loadSelectedBodyView(currentBodyViewId); - } + //4. $scope.loadSelectedBodyViewNavigator(currentBodyViewId); @@ -6077,7 +6071,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo } //if user seelcted any term and serached before gender cnage then itshould be highlighted in chnaged gender - if (($rootScope.isListManagerSelected == true) && (($rootScope.isGenderChnage == true) || $rootScope.isViewChange == true)) { + if ((($rootScope.isListManagerSelected == true) || ($rootScope.isHighLight == true && $rootScope.previousHighlightList != null && $rootScope.previousHighlightList.length > 0)) && (($rootScope.isGenderChnage == true) || $rootScope.isViewChange == true)) { $scope.setLayerNumberAndHighlightByTermList(); -- libgit2 0.21.4