ADAM / AIAHTML5

Commit 3b4ca7465fd89bd74c4f644ce846261237f75427

Authored by Nikita Kulshreshtha
1 parent 96fe7610

disabled/remove transparency when there is highlight of any part in any case

Inline Side-by-side
Showing 2 changed files with 13 additions and 5 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @3b4ca74
... ... @@ -2346,6 +2346,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2346 2346  
2347 2347 $scope.HighlightBodyByTermList = function (TermList) {
2348 2348  
  2349 + $("#btnTranparency").attr('disabled', 'disabled');
  2350 + $scope.currentLayerNumber = $scope.layerNumber;
  2351 +
2349 2352 $scope.layerNumber = $('#txtlayerNumber').val();
2350 2353  
2351 2354 $rootScope.isLoading = true;
... ... @@ -3933,7 +3936,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
3933 3936  
3934 3937 document.getElementById('canvasDiv').removeEventListener("mousedown", mouseDownListener);
3935 3938 //Dated:19-07-2016 Issue#4975: Transparency box should not be clickable if it is already selected.
3936   - if ($("#txtlayerNumber").val() != 0) {
  3939 + if ($("#txtlayerNumber").val() != 0 && $scope.currentLayerNumber != undefined) {
3937 3940 $('#layerChangeSlider').slider("option", "value", parseInt($rootScope.totalLayers) - parseInt($scope.currentLayerNumber));
3938 3941 $("#txtlayerNumber").val(parseInt($scope.currentLayerNumber));
3939 3942 }
... ... @@ -5935,7 +5938,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5935 5938  
5936 5939  
5937 5940 // $("#btnExtract").removeClass("disabled");
5938   - $("#btnTranparency").removeClass("disabled");
  5941 + // $("#btnTranparency").removeClass("disabled");
  5942 + $("#btnTranparency").removeAttr('disabled', 'disabled');
5939 5943 // $rootScope.isTransparencyBoxActivated = false;
5940 5944 // $rootScope.isNormalMode = false;
5941 5945  
... ... @@ -6006,7 +6010,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6006 6010 }
6007 6011  
6008 6012 $scope.enableNormalMode = function () {
6009   - $("#btnTranparency").removeClass("disabled");
  6013 + // $("#btnTranparency").removeClass("disabled");
  6014 + $("#btnTranparency").removeAttr('disabled', 'disabled');
6010 6015 $rootScope.isNormalMode = false;
6011 6016 console.log('enableNormalMode is called');
6012 6017  
... ... @@ -6236,7 +6241,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6236 6241  
6237 6242 $scope.highLightBody = function () {
6238 6243  
6239   -
  6244 + $scope.CloseTransparencyBox();
6240 6245 $scope.Normal = "";
6241 6246 $scope.Extract = "";
6242 6247 $scope.Highlight = "LeftButtonsDefaultState";
... ... @@ -7751,6 +7756,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
7751 7756  
7752 7757 $scope.HighlightBodyOnListManagerSelection = function (actualTermNumber) {
7753 7758  
  7759 + $scope.CloseTransparencyBox();
  7760 +
7754 7761 console.log('inside HighlightBodyOnListManagerSelection actualTermNumber= ' + actualTermNumber)
7755 7762 // Terms search in the Search list should be disable in the List Manager and Vice-Versa.
7756 7763 if ($rootScope.prevId == actualTermNumber) {
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @3b4ca74
... ... @@ -2297,7 +2297,8 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
2297 2297  
2298 2298 $rootScope.CloseListManager = function () {
2299 2299  
2300   -
  2300 + +$("#btnTranparency").removeAttr('disabled', 'disabled');
  2301 +
2301 2302 console.log('close');
2302 2303 $rootScope.disableAnnotationtoolOnListManager = false;
2303 2304 if ($rootScope.MenuModuleName == "DA") {
... ...