Commit 30312fb245e54e6b722b363d280fb76852dea8fe
Merge branch 'TBoxBlack1' into Develop
Showing
1 changed file
with
23 additions
and
3 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
| @@ -3683,7 +3683,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -3683,7 +3683,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
| 3683 | 3683 | ||
| 3684 | $('#btnTranparency').addClass('tButtonActive'); | 3684 | $('#btnTranparency').addClass('tButtonActive'); |
| 3685 | //debugger; | 3685 | //debugger; |
| 3686 | - $('#txtlayerNumber').val((parseInt($scope.currentLayerNumber)) + 1); | 3686 | + // $('#txtlayerNumber').val((parseInt($scope.currentLayerNumber)) + 1); |
| 3687 | //Dated:18-07-2016 Issue#4975: Transparency box should not be clickable if it is already selected. | 3687 | //Dated:18-07-2016 Issue#4975: Transparency box should not be clickable if it is already selected. |
| 3688 | $('#btnTranparency').removeClass('tButtonActive'); | 3688 | $('#btnTranparency').removeClass('tButtonActive'); |
| 3689 | $('#btnTranparency').addClass('btn-black'); | 3689 | $('#btnTranparency').addClass('btn-black'); |
| @@ -3853,11 +3853,31 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -3853,11 +3853,31 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
| 3853 | 3853 | ||
| 3854 | } | 3854 | } |
| 3855 | else { | 3855 | else { |
| 3856 | + //var currentLayer = parseInt($('#txtlayerNumber').val()); | ||
| 3857 | + | ||
| 3858 | + //var tranparencyLayer = currentLayer + 1; | ||
| 3859 | + //$scope.layerNumber = tranparencyLayer; | ||
| 3860 | + | ||
| 3861 | + var tranparencyLayer; | ||
| 3856 | var currentLayer = parseInt($('#txtlayerNumber').val()); | 3862 | var currentLayer = parseInt($('#txtlayerNumber').val()); |
| 3863 | + if (currentLayer == $rootScope.totalLayers) { | ||
| 3864 | + | ||
| 3865 | + tranparencyLayer = currentLayer; | ||
| 3866 | + | ||
| 3867 | + } | ||
| 3868 | + | ||
| 3869 | + else | ||
| 3870 | + { | ||
| 3871 | + | ||
| 3872 | + tranparencyLayer = currentLayer + 1; | ||
| 3873 | + | ||
| 3874 | + } | ||
| 3875 | + | ||
| 3876 | + $scope.layerNumber = tranparencyLayer; | ||
| 3857 | 3877 | ||
| 3858 | - var tranparencyLayer = currentLayer + 1; | ||
| 3859 | - $scope.layerNumber = tranparencyLayer; | ||
| 3860 | } | 3878 | } |
| 3879 | + | ||
| 3880 | + $('#txtlayerNumber').val($scope.layerNumber); | ||
| 3861 | 3881 | ||
| 3862 | //dedebugger; | 3882 | //dedebugger; |
| 3863 | //1. get the image source | 3883 | //1. get the image source |