ADAM / AIAHTML5

Commit 4767ef1e1902c8051e8cc25d247d5ced49f0e6bf

Authored by Nikita Kulshreshtha
1 parent e0e09d97

now the highlighted body part is maintained on gender/ view change.

Inline Side-by-side
Showing 1 changed file with 6 additions and 12 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @4767ef1
... ... @@ -5632,7 +5632,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5632 5632 $('#spinner').css('visibility', 'visible');
5633 5633 $timeout(function () { $scope.HighlightBodyByTermList($scope.systemMatchedTermList) }, 100);
5634 5634 }
5635   - else if ($rootScope.isListManagerSelected == true) {
  5635 + else if (($rootScope.isListManagerSelected == true) || ($rootScope.previousHighlightList != null && $rootScope.previousHighlightList.length > 0) && ($rootScope.isGenderChnage==true || $rootScope.isViewChange==true)) {
5636 5636  
5637 5637 // console.log('$scope.grayedBR.length is ' + $scope.grayedBR.length);
5638 5638 $timeout(function () {
... ... @@ -5927,13 +5927,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5927 5927 $rootScope.isLoading = true;
5928 5928 $('#spinner').css('visibility', 'visible');
5929 5929 //3.
5930   - if ($rootScope.isHighLight == true && $rootScope.previousHighlightList != null && $rootScope.previousHighlightList.length > 0) {
5931   - $scope.setLayerNumberAndHighlightByTermList();
5932   - }
5933   - else {
  5930 +
5934 5931 $scope.layerNumber = 0;
5935 5932 $scope.loadSelectedBodyView(currentBodyViewId);
5936   - }
  5933 +
5937 5934  
5938 5935 //4.
5939 5936 $scope.loadSelectedBodyViewNavigator(currentBodyViewId);
... ... @@ -5962,13 +5959,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5962 5959 $rootScope.isLoading = true;
5963 5960 $('#spinner').css('visibility', 'visible');
5964 5961 //3.
5965   - if ($rootScope.isHighLight == true && $rootScope.previousHighlightList != null && $rootScope.previousHighlightList.length > 0) {
5966   - $scope.setLayerNumberAndHighlightByTermList();
5967   - }
5968   - else {
  5962 +
5969 5963 $scope.layerNumber = 0;
5970 5964 $scope.loadSelectedBodyView(currentBodyViewId);
5971   - }
  5965 +
5972 5966  
5973 5967 //4.
5974 5968 $scope.loadSelectedBodyViewNavigator(currentBodyViewId);
... ... @@ -6077,7 +6071,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6077 6071 }
6078 6072 //if user seelcted any term and serached before gender cnage then itshould be highlighted in chnaged gender
6079 6073  
6080   - if (($rootScope.isListManagerSelected == true) && (($rootScope.isGenderChnage == true) || $rootScope.isViewChange == true)) {
  6074 + if ((($rootScope.isListManagerSelected == true) || ($rootScope.isHighLight == true && $rootScope.previousHighlightList != null && $rootScope.previousHighlightList.length > 0)) && (($rootScope.isGenderChnage == true) || $rootScope.isViewChange == true)) {
6081 6075  
6082 6076 $scope.setLayerNumberAndHighlightByTermList();
6083 6077  
... ...