Commit 989461f2576d16d1168f46efc21afd6837bb420c
1 parent
ca4916d6
Bug 14918 is resolved
Showing
1 changed file
with
9 additions
and
5 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -6118,8 +6118,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -6118,8 +6118,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
6118 | } | 6118 | } |
6119 | 6119 | ||
6120 | $scope.enableNormalMode = function () { | 6120 | $scope.enableNormalMode = function () { |
6121 | - // $("#btnTranparency").removeClass("disabled"); | ||
6122 | - $("#btnTranparency").removeAttr('disabled', 'disabled'); | 6121 | + $("#btnTranparency").removeClass("disabled"); |
6122 | + | ||
6123 | + // $("#btnTranparency").remove("disabled"); | ||
6124 | + | ||
6123 | $rootScope.isNormalMode = false; | 6125 | $rootScope.isNormalMode = false; |
6124 | console.log('enableNormalMode is called'); | 6126 | console.log('enableNormalMode is called'); |
6125 | 6127 | ||
@@ -6133,8 +6135,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -6133,8 +6135,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
6133 | $rootScope.isHighlightBodyByBodySystem = false; | 6135 | $rootScope.isHighlightBodyByBodySystem = false; |
6134 | 6136 | ||
6135 | 6137 | ||
6136 | - if ($rootScope.isNormalMode == true) { | ||
6137 | - | 6138 | + if ($rootScope.isNormalMode == true) { |
6138 | 6139 | ||
6139 | 6140 | ||
6140 | 6141 | ||
@@ -6246,9 +6247,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -6246,9 +6247,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
6246 | $rootScope.isExtract = true; | 6247 | $rootScope.isExtract = true; |
6247 | //disable transparency button | 6248 | //disable transparency button |
6248 | 6249 | ||
6250 | + | ||
6249 | $("#btnTranparency").addClass("disabled"); | 6251 | $("#btnTranparency").addClass("disabled"); |
6250 | 6252 | ||
6251 | - | ||
6252 | if ($rootScope.isNormalMode == true) { | 6253 | if ($rootScope.isNormalMode == true) { |
6253 | 6254 | ||
6254 | $rootScope.isHighLight = false; | 6255 | $rootScope.isHighLight = false; |
@@ -8510,6 +8511,9 @@ function onTboxClose() | @@ -8510,6 +8511,9 @@ function onTboxClose() | ||
8510 | function OnEnableNormalMode() | 8511 | function OnEnableNormalMode() |
8511 | { | 8512 | { |
8512 | console.log('OnEnableNormalMode is called outside '); | 8513 | console.log('OnEnableNormalMode is called outside '); |
8514 | + | ||
8515 | + $("#btnTranparency").removeClass("disabled"); | ||
8516 | + | ||
8513 | var scope = angular.element(document.getElementById("daView")).scope(); | 8517 | var scope = angular.element(document.getElementById("daView")).scope(); |
8514 | scope.$apply(function () { | 8518 | scope.$apply(function () { |
8515 | scope.enableNormalMode(); | 8519 | scope.enableNormalMode(); |