diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index f7ddc27..ad5b20f 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -2258,13 +2258,13 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo if ($scope.doAligneCanvasWithTerm == true) { //debugger; - if ($scope.isHighlightBodyByBodySystem == true || $rootScope.isListManagerSelected == true) + if ( $rootScope.isHighlightBodyByBodySystem == true || $rootScope.isListManagerSelected == true) $rootScope.isLoading = false; - $('#spinner').css('visibility', 'hidden'); + $('#spinner').css('visibility', 'hidden'); - $scope.isHighlightBodyByBodySystem = false; + //$rootScope.isHighlightBodyByBodySystem = false; if ($rootScope.isListManagerSelected == true) $scope.aligneCanvasWithTerm(); @@ -2418,7 +2418,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo //if listanager is visisble then close it - $rootScope.isListManagerSelected = false; + // $rootScope.isListManagerSelected = false; $rootScope.CloseListManager(); @@ -2542,7 +2542,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $('#canvasDiv').scrollLeft($scope.imageHorizontlScrollPosition) $('#canvasDiv').scrollTop($scope.imageVerticalScrollPosition) - if ($scope.isHighlightBodyByBodySystem) { + if ( $rootScope.isHighlightBodyByBodySystem) { $timeout(function () { $scope.DisableProgressBar() }, 20000); } else @@ -5254,7 +5254,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo //} - if (($scope.isHighlightBodyByBodySystem == true) && ($scope.systemMatchedTermList != null || $scope.systemMatchedTermList != undefined)) { + if (( $rootScope.isHighlightBodyByBodySystem == true) && ($scope.systemMatchedTermList != null || $scope.systemMatchedTermList != undefined)) { $scope.isLoading = true; @@ -6973,7 +6973,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo //NIKITA - $scope.isHighlightBodyByBodySystem = true; + $rootScope.isHighlightBodyByBodySystem = true; $scope.systemMatchedTermList = new jinqJs() .from($rootScope.BodySystemData.BodySystem.BodySystemTerm) .where('_SystemNumber == ' + event.currentTarget.id) @@ -6985,14 +6985,14 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo console.log('highLightBody from HighlightBodyByBodySystem') $scope.highLightBody(); } - //now highlight the selected body system in whole body + //$rootScope.isLoading = true; $('#spinner').css('visibility', 'visible'); //NIKITA - // $scope.isHighlightBodyByBodySystem = true; + // $rootScope.isHighlightBodyByBodySystem = true; //if (systemMatchedTermList != null || systemMatchedTermList != undefined) { @@ -7289,7 +7289,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $("#canvasDiv").scrollTop(scrolly); $("#canvasDiv").scrollLeft(scrollx); - if (($scope.isHighlightBodyByBodySystem == true) && ($scope.systemMatchedTermList != null || $scope.systemMatchedTermList != undefined)) { + if (( $rootScope.isHighlightBodyByBodySystem == true) && ($scope.systemMatchedTermList != null || $scope.systemMatchedTermList != undefined)) { $timeout(function () { $scope.HighlightBodyByTermList(systemMatchedTermList) }, 100); }