diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index 42a05f5..8558c8e 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -1421,7 +1421,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo if (isMaskImage == 'N') { - if ($scope.isLayerChangeUpDown || $scope.isCalledFromEnter) { + if ($scope.isLayerChangeByUpDownKey || $scope.isEnterPressed) { $scope.ColoredImageSRC.push( { "bodyRegionId": bodyRegionId, "SRC": src, @@ -1748,7 +1748,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo //do nothing } else { - if (($scope.isLayerChangeUpDown) || ($scope.isCalledFromEnter)) { + if (($scope.isLayerChangeByUpDownKey) || ($scope.isEnterPressed)) { $scope.ColoredImageSRC.push( { "bodyRegionId": bodyRegionId, "SRC": src, @@ -2514,15 +2514,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo else { - if ($scope.isLayerChangeUpDown) - { - $scope.isCalledFromEnter = false; - } - else - { - $scope.isCalledFromEnter = true; - } - + //1. Dated:13-07-2016 Issue #4965 : The layer number should not extend beyond its level through layer text box. var dataLength = $rootScope.BodyLayerData.Layers.DataLayer.length; if (parseInt($('#txtlayerNumber').val()) > (dataLength - 1)) { @@ -2568,7 +2560,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $scope.LayerChangeOnMouseUpDown = function (e) { - $scope.isLayerChangeUpDown = true; + $scope.isLayerChangeByUpDownKey = true; $scope.LayerChange(); } @@ -7695,6 +7687,18 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo } + $scope.LayerChangeBasedOnKeyPressed = function (e) { + + if(e.keyCode==13) + { + $scope.isEnterPressed = true; + + $scope.LayerChange(); + } + + } + + }] diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html b/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html index 8509b7a..1c4f5b7 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html +++ b/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html @@ -222,7 +222,7 @@

- +