Commit a668bf607c88d9b8b9549767f2b17528084c58b0
1 parent
305eb706
Refs: #7111
Showing
1 changed file
with
10 additions
and
3 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -3563,7 +3563,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -3563,7 +3563,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
3563 | 3563 | ||
3564 | $('#btnTranparency').addClass('tButtonActive'); | 3564 | $('#btnTranparency').addClass('tButtonActive'); |
3565 | //debugger; | 3565 | //debugger; |
3566 | - $('#txtlayerNumber').val((parseInt($scope.currentLayerNumber)) + 1); | 3566 | + // $('#txtlayerNumber').val((parseInt($scope.currentLayerNumber)) + 1); |
3567 | //Dated:18-07-2016 Issue#4975: Transparency box should not be clickable if it is already selected. | 3567 | //Dated:18-07-2016 Issue#4975: Transparency box should not be clickable if it is already selected. |
3568 | $('#btnTranparency').removeClass('tButtonActive'); | 3568 | $('#btnTranparency').removeClass('tButtonActive'); |
3569 | $('#btnTranparency').addClass('btn-black'); | 3569 | $('#btnTranparency').addClass('btn-black'); |
@@ -3731,12 +3731,19 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -3731,12 +3731,19 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
3731 | 3731 | ||
3732 | } | 3732 | } |
3733 | else { | 3733 | else { |
3734 | + var tranparencyLayer; | ||
3734 | var currentLayer = parseInt($('#txtlayerNumber').val()); | 3735 | var currentLayer = parseInt($('#txtlayerNumber').val()); |
3736 | + if (currentLayer == $rootScope.totalLayers) { | ||
3735 | 3737 | ||
3736 | - var tranparencyLayer = currentLayer + 1; | 3738 | + tranparencyLayer = currentLayer; |
3739 | + } | ||
3740 | + else { | ||
3741 | + tranparencyLayer = currentLayer + 1; | ||
3742 | + } | ||
3737 | $scope.layerNumber = tranparencyLayer; | 3743 | $scope.layerNumber = tranparencyLayer; |
3738 | } | 3744 | } |
3739 | - | 3745 | + |
3746 | + $('#txtlayerNumber').val($scope.layerNumber); | ||
3740 | //dedebugger; | 3747 | //dedebugger; |
3741 | //1. get the image source | 3748 | //1. get the image source |
3742 | var tranparencyImgSrc; | 3749 | var tranparencyImgSrc; |