From f7838fb2aaea359c2227cd35fb86e6044e8c6ca0 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 6 Oct 2016 13:38:10 +0530 Subject: [PATCH] Dissectible Anatomy > Num Lock is not working for enter the layer. --- 400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js | 35 +++++++++++++++++++++++------------ 400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html | 6 +++++- 2 files changed, 28 insertions(+), 13 deletions(-) diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index 9e83265..7e96544 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -2639,19 +2639,20 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $('#layerChangeSlider').slider("option", "value", parseInt($rootScope.totalLayers) - parseInt($scope.layerNumber)); } - + $rootScope.PreviouslayerNumbr = 0; $scope.LayerChangeOnMouseUpDown = function (e) { //'x' button is displaying inside the input box in IE browser. - + if (e.currentTarget.id == "incrmntVal") { //Dissectible Anatomy > Inappropriate Text in Layer Input box. if ($("#txtlayerNumber").val() == '') { var layerInputVal = 0; - - var layerInputValInc = parseInt(layerInputVal); - $scope.layerNumber = parseInt(layerInputValInc); - $("#txtlayerNumber").val($scope.layerNumber); - + + var layerInputValInc = parseInt(layerInputVal); + $scope.layerNumber = parseInt(layerInputValInc); + $("#txtlayerNumber").val($scope.layerNumber); + $rootScope.PreviouslayerNumbr = $scope.layerNumber; + } else { var layerInputVal = $("#txtlayerNumber").val(); @@ -2659,6 +2660,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo var layerInputValInc = parseInt(layerInputVal) + 1; $scope.layerNumber = parseInt(layerInputValInc); $("#txtlayerNumber").val($scope.layerNumber); + $rootScope.PreviouslayerNumbr = $scope.layerNumber; } } @@ -2672,17 +2674,20 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo var layerInputValDec = parseInt(layerInputVal); $scope.layerNumber = parseInt(layerInputValDec); $("#txtlayerNumber").val($scope.layerNumber); + $rootScope.PreviouslayerNumbr = $scope.layerNumber; } - else { + else + { var layerInputVal = $("#txtlayerNumber").val(); if (layerInputVal > 0) { var layerInputValDec = parseInt(layerInputVal) - 1; $scope.layerNumber = parseInt(layerInputValDec); $("#txtlayerNumber").val($scope.layerNumber); + $rootScope.PreviouslayerNumbr = $scope.layerNumber; } } - + } $scope.LayerChange(); @@ -8352,16 +8357,20 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo }); } - + $scope.LayerChangeBasedOnKeyPressed = function (e) { // Dissectible Anatomy > Should not display blank page if no layer is selected. if (e.keyCode == 13) { if ($("#txtlayerNumber").val() == '') { - $scope.layerNumber = 0; + + $("#txtlayerNumber").val($rootScope.PreviouslayerNumbr); + } + else + { + $scope.LayerChange(); } - $scope.LayerChange(); } @@ -8374,6 +8383,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo var layerInputValInc = parseInt(layerInputVal) + 1; $scope.layerNumber = parseInt(layerInputValInc); $("#txtlayerNumber").val($scope.layerNumber); + $rootScope.PreviouslayerNumbr = $scope.layerNumber; } @@ -8386,6 +8396,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo var layerInputValDec = parseInt(layerInputVal) - 1; $scope.layerNumber = parseInt(layerInputValDec); $("#txtlayerNumber").val($scope.layerNumber); + $rootScope.PreviouslayerNumbr = $scope.layerNumber; } } 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 e309d6a..1488834 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html +++ b/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html @@ -427,7 +427,11 @@ && e.which != 8 // backspace && e.which != 46 // delete && (e.which < 37 // arrow keys - || e.which > 40)) { + || e.which > 40) + && (e.keyCode < 96 // Dissectible Anatomy > Num Lock is not working for enter the layer. + || e.keyCode > 105)) + + { e.preventDefault(); return false; } -- libgit2 0.21.4