ADAM / AIAHTML5

Commit be6739f590018c616605b0e2cbbe2c6a839b8842

Authored by Amrita Vishnoi
2 parents 2c9f6d69 bdc1e0e0

Merged against #329 merge request

Inline Side-by-side
Showing 2 changed files with 15 additions and 8 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @be6739f
... ... @@ -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;
... ... @@ -3934,7 +3937,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
3934 3937  
3935 3938 document.getElementById('canvasDiv').removeEventListener("mousedown", mouseDownListener);
3936 3939 //Dated:19-07-2016 Issue#4975: Transparency box should not be clickable if it is already selected.
3937   - if ($("#txtlayerNumber").val() != 0) {
  3940 + if ($("#txtlayerNumber").val() != 0 && $scope.currentLayerNumber != undefined) {
3938 3941 $('#layerChangeSlider').slider("option", "value", parseInt($rootScope.totalLayers) - parseInt($scope.currentLayerNumber));
3939 3942 $("#txtlayerNumber").val(parseInt($scope.currentLayerNumber));
3940 3943 }
... ... @@ -5936,7 +5939,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5936 5939  
5937 5940  
5938 5941 // $("#btnExtract").removeClass("disabled");
5939   - $("#btnTranparency").removeClass("disabled");
  5942 + // $("#btnTranparency").removeClass("disabled");
  5943 + $("#btnTranparency").removeAttr('disabled', 'disabled');
5940 5944 // $rootScope.isTransparencyBoxActivated = false;
5941 5945 // $rootScope.isNormalMode = false;
5942 5946  
... ... @@ -6007,7 +6011,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6007 6011 }
6008 6012  
6009 6013 $scope.enableNormalMode = function () {
6010   - $("#btnTranparency").removeClass("disabled");
  6014 + // $("#btnTranparency").removeClass("disabled");
  6015 + $("#btnTranparency").removeAttr('disabled', 'disabled');
6011 6016 $rootScope.isNormalMode = false;
6012 6017 console.log('enableNormalMode is called');
6013 6018  
... ... @@ -6237,11 +6242,11 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6237 6242  
6238 6243 $scope.highLightBody = function () {
6239 6244  
6240   -
  6245 + $scope.CloseTransparencyBox();
6241 6246 $scope.Normal = "";
6242 6247 $scope.Extract = "";
6243 6248 $scope.Highlight = "LeftButtonsDefaultState";
6244   -
  6249 + $("#btnTranparency").removeAttr('disabled', 'disabled');
6245 6250 console.log('highLightBody is called and ColoredImageSRC length: ' + $scope.ColoredImageSRC.length);
6246 6251  
6247 6252 $scope.terminateCurrentlyRunningWPs();
... ... @@ -6933,11 +6938,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6933 6938 $scope.layerNumber = 0;
6934 6939  
6935 6940 //remove existing body view
6936   - // $scope.flushCanvas();
6937 6941 var canDiv = document.getElementById('canvasDiv');
6938 6942 var canDivChildCount = canDiv.childElementCount;
6939 6943 if (canDivChildCount > 0) {
6940   - canDiv.innerHTML = '';
  6944 + canDiv.innerHTML = '';
6941 6945 }
6942 6946  
6943 6947 var selectedViewId = $scope.bodyViews[event.currentTarget.title];
... ... @@ -7726,6 +7730,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
7726 7730  
7727 7731 $scope.HighlightBodyOnListManagerSelection = function (actualTermNumber) {
7728 7732  
  7733 + $scope.CloseTransparencyBox();
  7734 +
7729 7735 console.log('inside HighlightBodyOnListManagerSelection actualTermNumber= ' + actualTermNumber)
7730 7736 // Terms search in the Search list should be disable in the List Manager and Vice-Versa.
7731 7737 if ($rootScope.prevId == actualTermNumber) {
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @be6739f
... ... @@ -2379,7 +2379,8 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
2379 2379  
2380 2380 $rootScope.CloseListManager = function () {
2381 2381  
2382   -
  2382 + +$("#btnTranparency").removeAttr('disabled', 'disabled');
  2383 +
2383 2384 console.log('close');
2384 2385 $rootScope.disableAnnotationtoolOnListManager = false;
2385 2386 if ($rootScope.MenuModuleName == "DA") {
... ...