Commit 85ca6392c68e690a262365916dbb50b7a5651d5a
Merge branch 'Bug-14918' into Develop
Showing
1 changed file
with
9 additions
and
5 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -6138,8 +6138,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -6138,8 +6138,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
6138 | } | 6138 | } |
6139 | 6139 | ||
6140 | $scope.enableNormalMode = function () { | 6140 | $scope.enableNormalMode = function () { |
6141 | - // $("#btnTranparency").removeClass("disabled"); | ||
6142 | - $("#btnTranparency").removeAttr('disabled', 'disabled'); | 6141 | + $("#btnTranparency").removeClass("disabled"); |
6142 | + | ||
6143 | + // $("#btnTranparency").remove("disabled"); | ||
6144 | + | ||
6143 | $rootScope.isNormalMode = false; | 6145 | $rootScope.isNormalMode = false; |
6144 | console.log('enableNormalMode is called'); | 6146 | console.log('enableNormalMode is called'); |
6145 | 6147 | ||
@@ -6153,8 +6155,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -6153,8 +6155,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
6153 | $rootScope.isHighlightBodyByBodySystem = false; | 6155 | $rootScope.isHighlightBodyByBodySystem = false; |
6154 | 6156 | ||
6155 | 6157 | ||
6156 | - if ($rootScope.isNormalMode == true) { | ||
6157 | - | 6158 | + if ($rootScope.isNormalMode == true) { |
6158 | 6159 | ||
6159 | 6160 | ||
6160 | 6161 | ||
@@ -6266,9 +6267,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -6266,9 +6267,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
6266 | $rootScope.isExtract = true; | 6267 | $rootScope.isExtract = true; |
6267 | //disable transparency button | 6268 | //disable transparency button |
6268 | 6269 | ||
6270 | + | ||
6269 | $("#btnTranparency").addClass("disabled"); | 6271 | $("#btnTranparency").addClass("disabled"); |
6270 | 6272 | ||
6271 | - | ||
6272 | if ($rootScope.isNormalMode == true) { | 6273 | if ($rootScope.isNormalMode == true) { |
6273 | 6274 | ||
6274 | $rootScope.isHighLight = false; | 6275 | $rootScope.isHighLight = false; |
@@ -8526,6 +8527,9 @@ function onTboxClose() | @@ -8526,6 +8527,9 @@ function onTboxClose() | ||
8526 | function OnEnableNormalMode() | 8527 | function OnEnableNormalMode() |
8527 | { | 8528 | { |
8528 | console.log('OnEnableNormalMode is called outside '); | 8529 | console.log('OnEnableNormalMode is called outside '); |
8530 | + | ||
8531 | + $("#btnTranparency").removeClass("disabled"); | ||
8532 | + | ||
8529 | var scope = angular.element(document.getElementById("daView")).scope(); | 8533 | var scope = angular.element(document.getElementById("daView")).scope(); |
8530 | scope.$apply(function () { | 8534 | scope.$apply(function () { |
8531 | scope.enableNormalMode(); | 8535 | scope.enableNormalMode(); |