diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index 297fc5b..d760528 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -4298,6 +4298,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l if ($rootScope.isExtract == false) { $("#btnExtract").addClass("disabled"); + $("#btnExtract").css("pointer-events", "none"); //if listanager is visisble then close it $rootScope.isListManagerSelected = false; @@ -6415,6 +6416,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l //To enable extract button $rootScope.isTransparencyActivated = false; $("#btnExtract").removeClass("disabled"); + $("#btnExtract").css("pointer-events", "auto"); $('.com_anno').remove(); @@ -6635,13 +6637,19 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l $("#annotationButton").removeClass("active"); if ($scope.isTransparencyBtnClicked == true && !$scope.isTransparencyActivated) { $("#btnExtract").addClass("disabled"); + $("#btnExtract").css("pointer-events", "none"); + $('#btnTranparency').addClass('tButtonActive'); $('#btnTranparency').removeClass('btn-black'); } else $("#btnExtract").removeClass("disabled"); + $("#btnExtract").css("pointer-events", "auto"); + $("#btnTranparency").removeClass("disabled"); + $("#btnTranparency").css("pointer-events", "auto"); + $rootScope.isTransparencyBoxActivated = false; $rootScope.isNormalMode = false; $rootScope.isGenderChnage = false; @@ -6878,6 +6886,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l $scope.enableNormalMode = function () { $("#btnTranparency").removeClass("disabled"); + $("#btnTranparency").css("pointer-events", "auto"); if ($rootScope.isTransparencyActivated) { $scope.layerNumber = $rootScope.currentLayerNumber; @@ -6996,6 +7005,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l if ($rootScope.isTransparencyActivated == true) { $("#btnExtract").addClass("disabled"); + $("#btnExtract").css("pointer-events", "none"); } @@ -7020,6 +7030,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l $("#btnTranparency").addClass("disabled"); + $("#btnTranparency").css("pointer-events", "none"); if ($rootScope.isNormalMode == true) { @@ -7046,7 +7057,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l //disable transparency button $("#btnTranparency").addClass("disabled"); - + $("#btnTranparency").css("pointer-events", "none"); if ($rootScope.isNormalMode == true) { @@ -7129,6 +7140,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l $scope.CloseTransparencyBox(); if ($scope.isTransparencyBtnClicked == true && !$scope.isTransparencyActivated) { $("#btnExtract").addClass("disabled"); + $("#btnExtract").css("pointer-events", "none"); $('#btnTranparency').addClass('tButtonActive'); $('#btnTranparency').removeClass('btn-black'); } @@ -7637,7 +7649,10 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l $scope.imageHorizontlScrollPosition = canvasDiv.scrollLeft; $("#btnExtract").removeClass("disabled"); + $("#btnExtract").css("pointer-events", "auto"); + $("#btnTranparency").removeClass("disabled"); + $("#btnTranparency").css("pointer-events", "auto"); $rootScope.isTransparencyBoxActivated = false; $rootScope.isNormalMode = false; @@ -7645,6 +7660,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l $scope.CloseTransparencyBox(); if ($scope.isTransparencyBtnClicked == true && !$scope.isTransparencyActivated) { $("#btnExtract").addClass("disabled"); + $("#btnExtract").css("pointer-events", "none"); + $('#btnTranparency').addClass('tButtonActive'); $('#btnTranparency').removeClass('btn-black'); } @@ -7886,7 +7903,11 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l $scope.imageHorizontlScrollPosition = canvasDiv.scrollLeft; $("#btnExtract").removeClass("disabled"); + $("#btnExtract").css("pointer-events", "auto"); + $("#btnTranparency").removeClass("disabled"); + $("#btnTranparency").css("pointer-events", "auto"); + $rootScope.isTransparencyBoxActivated = false; $rootScope.isNormalMode = false; @@ -7894,6 +7915,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l $scope.CloseTransparencyBox(); if ($scope.isTransparencyBtnClicked == true && !$scope.isTransparencyActivated) { $("#btnExtract").addClass("disabled"); + $("#btnExtract").css("pointer-events", "none"); + $('#btnTranparency').addClass('tButtonActive'); $('#btnTranparency').removeClass('btn-black'); } @@ -9486,6 +9509,7 @@ function OnEnableNormalMode() { console.log('OnEnableNormalMode is called outside '); $("#btnTranparency").removeClass("disabled"); + $("#btnTranparency").css("pointer-events", "auto"); var scope = angular.element(document.getElementById("daView")).scope(); scope.$apply(function () {