Commit 1b575eae7a3ce7e334722d069f411b63c479cbd2
1 parent
6b41c04b
fixed this issue
Showing
1 changed file
with
9 additions
and
2 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
... | ... | @@ -2844,7 +2844,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l |
2844 | 2844 | |
2845 | 2845 | |
2846 | 2846 | if ($rootScope.isHighLight == true) { |
2847 | - false; | |
2847 | + $rootScope.isHighLight = false; | |
2848 | + $scope.CloseTransparencyBox(); | |
2848 | 2849 | } |
2849 | 2850 | |
2850 | 2851 | console.log('HighlightBodyByTermListForBodySystem is called'); |
... | ... | @@ -7005,7 +7006,12 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l |
7005 | 7006 | |
7006 | 7007 | $scope.highLightBody = function () { |
7007 | 7008 | |
7008 | - $scope.CloseTransparencyBox(); | |
7009 | + if ($rootScope.isTransparencyActivated && $rootScope.isGlobalSettingChanged) { | |
7010 | + //do not close Tbox | |
7011 | + $rootScope.isGlobalSettingChanged = false; | |
7012 | + } | |
7013 | + else | |
7014 | + $scope.CloseTransparencyBox(); | |
7009 | 7015 | $scope.Normal = ""; |
7010 | 7016 | $scope.Extract = ""; |
7011 | 7017 | $scope.Highlight = "LeftButtonsDefaultState"; |
... | ... | @@ -7959,6 +7965,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l |
7959 | 7965 | //Reload DA controller Body View after setting Change |
7960 | 7966 | $scope.$on('reloadDABodyViewEvent', function (event, data) { |
7961 | 7967 | //console.log('reloadDABodyViewEvent'); |
7968 | + $rootScope.isGlobalSettingChanged = true; | |
7962 | 7969 | if ($rootScope.isSettingEventAlredayDispachted == true) { |
7963 | 7970 | $rootScope.isSettingEventAlredayDispachted = false; |
7964 | 7971 | $scope.layerNumber = parseInt($('#txtlayerNumber').val()); | ... | ... |