ADAM / AIAHTML5

Commit 60c4a5b127ea3b913f88d2a7f708e0fb7b6f66f4

Authored by Nikita Kulshreshtha
1 parent 17602650

extract button was disabled but it was clickable. 

added css
Inline Side-by-side
Showing 1 changed file with 25 additions and 1 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @60c4a5b
... ... @@ -4298,6 +4298,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
4298 4298 if ($rootScope.isExtract == false) {
4299 4299  
4300 4300 $("#btnExtract").addClass("disabled");
  4301 + $("#btnExtract").css("pointer-events", "none");
4301 4302  
4302 4303 //if listanager is visisble then close it
4303 4304 $rootScope.isListManagerSelected = false;
... ... @@ -6415,6 +6416,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
6415 6416 //To enable extract button
6416 6417 $rootScope.isTransparencyActivated = false;
6417 6418 $("#btnExtract").removeClass("disabled");
  6419 + $("#btnExtract").css("pointer-events", "auto");
6418 6420  
6419 6421  
6420 6422 $('.com_anno').remove();
... ... @@ -6635,13 +6637,19 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
6635 6637 $("#annotationButton").removeClass("active");
6636 6638 if ($scope.isTransparencyBtnClicked == true && !$scope.isTransparencyActivated) {
6637 6639 $("#btnExtract").addClass("disabled");
  6640 + $("#btnExtract").css("pointer-events", "none");
  6641 +
6638 6642 $('#btnTranparency').addClass('tButtonActive');
6639 6643 $('#btnTranparency').removeClass('btn-black');
6640 6644 }
6641 6645 else
6642 6646 $("#btnExtract").removeClass("disabled");
  6647 + $("#btnExtract").css("pointer-events", "auto");
  6648 +
6643 6649  
6644 6650 $("#btnTranparency").removeClass("disabled");
  6651 + $("#btnTranparency").css("pointer-events", "auto");
  6652 +
6645 6653 $rootScope.isTransparencyBoxActivated = false;
6646 6654 $rootScope.isNormalMode = false;
6647 6655 $rootScope.isGenderChnage = false;
... ... @@ -6878,6 +6886,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
6878 6886  
6879 6887 $scope.enableNormalMode = function () {
6880 6888 $("#btnTranparency").removeClass("disabled");
  6889 + $("#btnTranparency").css("pointer-events", "auto");
6881 6890  
6882 6891 if ($rootScope.isTransparencyActivated) {
6883 6892 $scope.layerNumber = $rootScope.currentLayerNumber;
... ... @@ -6996,6 +7005,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
6996 7005 if ($rootScope.isTransparencyActivated == true) {
6997 7006  
6998 7007 $("#btnExtract").addClass("disabled");
  7008 + $("#btnExtract").css("pointer-events", "none");
6999 7009  
7000 7010 }
7001 7011  
... ... @@ -7020,6 +7030,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
7020 7030  
7021 7031  
7022 7032 $("#btnTranparency").addClass("disabled");
  7033 + $("#btnTranparency").css("pointer-events", "none");
7023 7034  
7024 7035 if ($rootScope.isNormalMode == true) {
7025 7036  
... ... @@ -7046,7 +7057,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
7046 7057 //disable transparency button
7047 7058  
7048 7059 $("#btnTranparency").addClass("disabled");
7049   -
  7060 + $("#btnTranparency").css("pointer-events", "none");
7050 7061  
7051 7062 if ($rootScope.isNormalMode == true) {
7052 7063  
... ... @@ -7129,6 +7140,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
7129 7140 $scope.CloseTransparencyBox();
7130 7141 if ($scope.isTransparencyBtnClicked == true && !$scope.isTransparencyActivated) {
7131 7142 $("#btnExtract").addClass("disabled");
  7143 + $("#btnExtract").css("pointer-events", "none");
7132 7144 $('#btnTranparency').addClass('tButtonActive');
7133 7145 $('#btnTranparency').removeClass('btn-black');
7134 7146 }
... ... @@ -7637,7 +7649,10 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
7637 7649 $scope.imageHorizontlScrollPosition = canvasDiv.scrollLeft;
7638 7650  
7639 7651 $("#btnExtract").removeClass("disabled");
  7652 + $("#btnExtract").css("pointer-events", "auto");
  7653 +
7640 7654 $("#btnTranparency").removeClass("disabled");
  7655 + $("#btnTranparency").css("pointer-events", "auto");
7641 7656 $rootScope.isTransparencyBoxActivated = false;
7642 7657 $rootScope.isNormalMode = false;
7643 7658  
... ... @@ -7645,6 +7660,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
7645 7660 $scope.CloseTransparencyBox();
7646 7661 if ($scope.isTransparencyBtnClicked == true && !$scope.isTransparencyActivated) {
7647 7662 $("#btnExtract").addClass("disabled");
  7663 + $("#btnExtract").css("pointer-events", "none");
  7664 +
7648 7665 $('#btnTranparency').addClass('tButtonActive');
7649 7666 $('#btnTranparency').removeClass('btn-black');
7650 7667 }
... ... @@ -7886,7 +7903,11 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
7886 7903 $scope.imageHorizontlScrollPosition = canvasDiv.scrollLeft;
7887 7904  
7888 7905 $("#btnExtract").removeClass("disabled");
  7906 + $("#btnExtract").css("pointer-events", "auto");
  7907 +
7889 7908 $("#btnTranparency").removeClass("disabled");
  7909 + $("#btnTranparency").css("pointer-events", "auto");
  7910 +
7890 7911 $rootScope.isTransparencyBoxActivated = false;
7891 7912 $rootScope.isNormalMode = false;
7892 7913  
... ... @@ -7894,6 +7915,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
7894 7915 $scope.CloseTransparencyBox();
7895 7916 if ($scope.isTransparencyBtnClicked == true && !$scope.isTransparencyActivated) {
7896 7917 $("#btnExtract").addClass("disabled");
  7918 + $("#btnExtract").css("pointer-events", "none");
  7919 +
7897 7920 $('#btnTranparency').addClass('tButtonActive');
7898 7921 $('#btnTranparency').removeClass('btn-black');
7899 7922 }
... ... @@ -9486,6 +9509,7 @@ function OnEnableNormalMode() {
9486 9509 console.log('OnEnableNormalMode is called outside ');
9487 9510  
9488 9511 $("#btnTranparency").removeClass("disabled");
  9512 + $("#btnTranparency").css("pointer-events", "auto");
9489 9513  
9490 9514 var scope = angular.element(document.getElementById("daView")).scope();
9491 9515 scope.$apply(function () {
... ...