Commit f7838fb2aaea359c2227cd35fb86e6044e8c6ca0
1 parent
d5e4cc4b
Dissectible Anatomy > Num Lock is not working for enter the layer.
Showing
2 changed files
with
28 additions
and
13 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
... | ... | @@ -2639,19 +2639,20 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo |
2639 | 2639 | |
2640 | 2640 | $('#layerChangeSlider').slider("option", "value", parseInt($rootScope.totalLayers) - parseInt($scope.layerNumber)); |
2641 | 2641 | } |
2642 | - | |
2642 | + $rootScope.PreviouslayerNumbr = 0; | |
2643 | 2643 | $scope.LayerChangeOnMouseUpDown = function (e) { |
2644 | 2644 | //'x' button is displaying inside the input box in IE browser. |
2645 | - | |
2645 | + | |
2646 | 2646 | if (e.currentTarget.id == "incrmntVal") { |
2647 | 2647 | //Dissectible Anatomy > Inappropriate Text in Layer Input box. |
2648 | 2648 | if ($("#txtlayerNumber").val() == '') { |
2649 | 2649 | var layerInputVal = 0; |
2650 | - | |
2651 | - var layerInputValInc = parseInt(layerInputVal); | |
2652 | - $scope.layerNumber = parseInt(layerInputValInc); | |
2653 | - $("#txtlayerNumber").val($scope.layerNumber); | |
2654 | - | |
2650 | + | |
2651 | + var layerInputValInc = parseInt(layerInputVal); | |
2652 | + $scope.layerNumber = parseInt(layerInputValInc); | |
2653 | + $("#txtlayerNumber").val($scope.layerNumber); | |
2654 | + $rootScope.PreviouslayerNumbr = $scope.layerNumber; | |
2655 | + | |
2655 | 2656 | } |
2656 | 2657 | else { |
2657 | 2658 | var layerInputVal = $("#txtlayerNumber").val(); |
... | ... | @@ -2659,6 +2660,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo |
2659 | 2660 | var layerInputValInc = parseInt(layerInputVal) + 1; |
2660 | 2661 | $scope.layerNumber = parseInt(layerInputValInc); |
2661 | 2662 | $("#txtlayerNumber").val($scope.layerNumber); |
2663 | + $rootScope.PreviouslayerNumbr = $scope.layerNumber; | |
2662 | 2664 | } |
2663 | 2665 | |
2664 | 2666 | } |
... | ... | @@ -2672,17 +2674,20 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo |
2672 | 2674 | var layerInputValDec = parseInt(layerInputVal); |
2673 | 2675 | $scope.layerNumber = parseInt(layerInputValDec); |
2674 | 2676 | $("#txtlayerNumber").val($scope.layerNumber); |
2677 | + $rootScope.PreviouslayerNumbr = $scope.layerNumber; | |
2675 | 2678 | |
2676 | 2679 | } |
2677 | - else { | |
2680 | + else | |
2681 | + { | |
2678 | 2682 | var layerInputVal = $("#txtlayerNumber").val(); |
2679 | 2683 | if (layerInputVal > 0) { |
2680 | 2684 | var layerInputValDec = parseInt(layerInputVal) - 1; |
2681 | 2685 | $scope.layerNumber = parseInt(layerInputValDec); |
2682 | 2686 | $("#txtlayerNumber").val($scope.layerNumber); |
2687 | + $rootScope.PreviouslayerNumbr = $scope.layerNumber; | |
2683 | 2688 | } |
2684 | 2689 | } |
2685 | - | |
2690 | + | |
2686 | 2691 | } |
2687 | 2692 | $scope.LayerChange(); |
2688 | 2693 | |
... | ... | @@ -8352,16 +8357,20 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo |
8352 | 8357 | }); |
8353 | 8358 | |
8354 | 8359 | } |
8355 | - | |
8360 | + | |
8356 | 8361 | $scope.LayerChangeBasedOnKeyPressed = function (e) { |
8357 | 8362 | // Dissectible Anatomy > Should not display blank page if no layer is selected. |
8358 | 8363 | if (e.keyCode == 13) { |
8359 | 8364 | if ($("#txtlayerNumber").val() == '') |
8360 | 8365 | { |
8361 | - $scope.layerNumber = 0; | |
8366 | + | |
8367 | + $("#txtlayerNumber").val($rootScope.PreviouslayerNumbr); | |
8368 | + } | |
8369 | + else | |
8370 | + { | |
8371 | + $scope.LayerChange(); | |
8362 | 8372 | } |
8363 | 8373 | |
8364 | - $scope.LayerChange(); | |
8365 | 8374 | |
8366 | 8375 | } |
8367 | 8376 | |
... | ... | @@ -8374,6 +8383,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo |
8374 | 8383 | var layerInputValInc = parseInt(layerInputVal) + 1; |
8375 | 8384 | $scope.layerNumber = parseInt(layerInputValInc); |
8376 | 8385 | $("#txtlayerNumber").val($scope.layerNumber); |
8386 | + $rootScope.PreviouslayerNumbr = $scope.layerNumber; | |
8377 | 8387 | } |
8378 | 8388 | |
8379 | 8389 | |
... | ... | @@ -8386,6 +8396,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo |
8386 | 8396 | var layerInputValDec = parseInt(layerInputVal) - 1; |
8387 | 8397 | $scope.layerNumber = parseInt(layerInputValDec); |
8388 | 8398 | $("#txtlayerNumber").val($scope.layerNumber); |
8399 | + $rootScope.PreviouslayerNumbr = $scope.layerNumber; | |
8389 | 8400 | } |
8390 | 8401 | } |
8391 | 8402 | ... | ... |
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
... | ... | @@ -427,7 +427,11 @@ |
427 | 427 | && e.which != 8 // backspace |
428 | 428 | && e.which != 46 // delete |
429 | 429 | && (e.which < 37 // arrow keys |
430 | - || e.which > 40)) { | |
430 | + || e.which > 40) | |
431 | + && (e.keyCode < 96 // Dissectible Anatomy > Num Lock is not working for enter the layer. | |
432 | + || e.keyCode > 105)) | |
433 | + | |
434 | + { | |
431 | 435 | e.preventDefault(); |
432 | 436 | return false; |
433 | 437 | } | ... | ... |