ADAM / AIAHTML5

Commit 6216f09f13253ab905cb7ac76efb465298d3c75d

Authored by unknown
2 parents 23661fb7 3f0c6648

Merge branch 'QA' of http://52.6.196.163/ADAM/AIAHTML5 into AALoaderIssue

Inline Side-by-side
Showing 1 changed file with 6 additions and 6 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @6216f09
@@ -6418,7 +6418,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -6418,7 +6418,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
6418 6418
6419 $rootScope.CloseListManager(); 6419 $rootScope.CloseListManager();
6420 6420
6421 - // $rootScope.isHighlightBodyByBodySystem = false; 6421 + $rootScope.isHighlightBodyByBodySystem = false;
6422 6422
6423 6423
6424 $('#sppeachBubble').css('display', 'none'); 6424 $('#sppeachBubble').css('display', 'none');
@@ -6582,7 +6582,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -6582,7 +6582,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
6582 // $rootScope.isListManagerSelected = false; 6582 // $rootScope.isListManagerSelected = false;
6583 $rootScope.CloseListManager(); 6583 $rootScope.CloseListManager();
6584 6584
6585 - // $rootScope.isHighlightBodyByBodySystem = false; 6585 + $rootScope.isHighlightBodyByBodySystem = false;
6586 6586
6587 if ($rootScope.isHighLight == true) { 6587 if ($rootScope.isHighLight == true) {
6588 6588
@@ -6666,7 +6666,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -6666,7 +6666,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
6666 $rootScope.CloseListManager(); 6666 $rootScope.CloseListManager();
6667 6667
6668 6668
6669 - // $rootScope.isHighlightBodyByBodySystem = false; 6669 + $rootScope.isHighlightBodyByBodySystem = false;
6670 6670
6671 6671
6672 if ($rootScope.isNormalMode == true) { 6672 if ($rootScope.isNormalMode == true) {
@@ -6748,7 +6748,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -6748,7 +6748,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
6748 6748
6749 console.log('isCalledFromButton= ' + isCalledFromButton); 6749 console.log('isCalledFromButton= ' + isCalledFromButton);
6750 6750
6751 - // $rootScope.isHighlightBodyByBodySystem = false; 6751 + $rootScope.isHighlightBodyByBodySystem = false;
6752 6752
6753 6753
6754 $rootScope.CanvasDivTopPosition = $("#canvasDiv").scrollTop(); 6754 $rootScope.CanvasDivTopPosition = $("#canvasDiv").scrollTop();
@@ -7345,7 +7345,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -7345,7 +7345,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
7345 // $rootScope.isListManagerSelected = false; 7345 // $rootScope.isListManagerSelected = false;
7346 $rootScope.CloseListManager(); 7346 $rootScope.CloseListManager();
7347 7347
7348 - // $rootScope.isHighlightBodyByBodySystem = false; 7348 + $rootScope.isHighlightBodyByBodySystem = false;
7349 7349
7350 //Remove the Search list and then Repopulate it on change of Gender 7350 //Remove the Search list and then Repopulate it on change of Gender
7351 $('#searchListDiv').empty() 7351 $('#searchListDiv').empty()
@@ -7585,7 +7585,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -7585,7 +7585,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
7585 //$rootScope.isListManagerSelected = false; 7585 //$rootScope.isListManagerSelected = false;
7586 $rootScope.CloseListManager(); 7586 $rootScope.CloseListManager();
7587 7587
7588 - // $rootScope.isHighlightBodyByBodySystem = false; 7588 + $rootScope.isHighlightBodyByBodySystem = false;
7589 7589
7590 //Remove the search list and then Repopulate it on change of View 7590 //Remove the search list and then Repopulate it on change of View
7591 $('#searchListDiv').empty() 7591 $('#searchListDiv').empty()