Commit e165b8c7c0aefda92d6e77fd789374a95459e604
1 parent
f7838fb2
Defect in transparency level
Showing
2 changed files
with
37 additions
and
6 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -2651,7 +2651,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -2651,7 +2651,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
2651 | var layerInputValInc = parseInt(layerInputVal); | 2651 | var layerInputValInc = parseInt(layerInputVal); |
2652 | $scope.layerNumber = parseInt(layerInputValInc); | 2652 | $scope.layerNumber = parseInt(layerInputValInc); |
2653 | $("#txtlayerNumber").val($scope.layerNumber); | 2653 | $("#txtlayerNumber").val($scope.layerNumber); |
2654 | - $rootScope.PreviouslayerNumbr = $scope.layerNumber; | 2654 | + // $rootScope.PreviouslayerNumbr = $scope.layerNumber; |
2655 | 2655 | ||
2656 | } | 2656 | } |
2657 | else { | 2657 | else { |
@@ -2674,7 +2674,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -2674,7 +2674,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
2674 | var layerInputValDec = parseInt(layerInputVal); | 2674 | var layerInputValDec = parseInt(layerInputVal); |
2675 | $scope.layerNumber = parseInt(layerInputValDec); | 2675 | $scope.layerNumber = parseInt(layerInputValDec); |
2676 | $("#txtlayerNumber").val($scope.layerNumber); | 2676 | $("#txtlayerNumber").val($scope.layerNumber); |
2677 | - $rootScope.PreviouslayerNumbr = $scope.layerNumber; | 2677 | + // $rootScope.PreviouslayerNumbr = $scope.layerNumber; |
2678 | 2678 | ||
2679 | } | 2679 | } |
2680 | else | 2680 | else |
@@ -8360,14 +8360,18 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -8360,14 +8360,18 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
8360 | 8360 | ||
8361 | $scope.LayerChangeBasedOnKeyPressed = function (e) { | 8361 | $scope.LayerChangeBasedOnKeyPressed = function (e) { |
8362 | // Dissectible Anatomy > Should not display blank page if no layer is selected. | 8362 | // Dissectible Anatomy > Should not display blank page if no layer is selected. |
8363 | + | ||
8364 | + | ||
8363 | if (e.keyCode == 13) { | 8365 | if (e.keyCode == 13) { |
8366 | + | ||
8364 | if ($("#txtlayerNumber").val() == '') | 8367 | if ($("#txtlayerNumber").val() == '') |
8365 | { | 8368 | { |
8366 | - | 8369 | + |
8367 | $("#txtlayerNumber").val($rootScope.PreviouslayerNumbr); | 8370 | $("#txtlayerNumber").val($rootScope.PreviouslayerNumbr); |
8368 | } | 8371 | } |
8369 | else | 8372 | else |
8370 | { | 8373 | { |
8374 | + $rootScope.PreviouslayerNumbr = $("#txtlayerNumber").val(); | ||
8371 | $scope.LayerChange(); | 8375 | $scope.LayerChange(); |
8372 | } | 8376 | } |
8373 | 8377 | ||
@@ -8400,11 +8404,38 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -8400,11 +8404,38 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
8400 | } | 8404 | } |
8401 | } | 8405 | } |
8402 | 8406 | ||
8403 | - | ||
8404 | } | 8407 | } |
8405 | 8408 | ||
8406 | 8409 | ||
8407 | - | 8410 | + $scope.LayerValueChangeBasedOnKeyUp = function (e) { |
8411 | + | ||
8412 | + var keyUplayerNumber = parseInt($("#txtlayerNumber").val()); | ||
8413 | + | ||
8414 | + if (isNaN(keyUplayerNumber)) | ||
8415 | + { | ||
8416 | + | ||
8417 | + } | ||
8418 | + else { | ||
8419 | + | ||
8420 | + if (keyUplayerNumber > $rootScope.totalLayers) { | ||
8421 | + | ||
8422 | + $("#txtlayerNumber").val($rootScope.totalLayers); | ||
8423 | + $scope.layerNumber = parseInt($rootScope.totalLayers); | ||
8424 | + | ||
8425 | + } | ||
8426 | + else { | ||
8427 | + | ||
8428 | + $("#txtlayerNumber").val(keyUplayerNumber); | ||
8429 | + $scope.layerNumber = parseInt(keyUplayerNumber); | ||
8430 | + | ||
8431 | + | ||
8432 | + } | ||
8433 | + | ||
8434 | + } | ||
8435 | + | ||
8436 | + | ||
8437 | + } | ||
8438 | + | ||
8408 | 8439 | ||
8409 | 8440 | ||
8410 | }] | 8441 | }] |
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
@@ -253,7 +253,7 @@ | @@ -253,7 +253,7 @@ | ||
253 | <!--'x' button is displaying inside the input box in IE browser.--> | 253 | <!--'x' button is displaying inside the input box in IE browser.--> |
254 | <div style="width:80px;margin:10px 0 0 15px;display:inline-block;"> | 254 | <div style="width:80px;margin:10px 0 0 15px;display:inline-block;"> |
255 | <div style="width: 58px; float: left;"> | 255 | <div style="width: 58px; float: left;"> |
256 | - <input type="text" class="form-control item" id="txtlayerNumber" value="0" ng-model="layerNumber" ng-keydown="LayerChangeBasedOnKeyPressed($event)" style="height:32px;border-radius:0;"> | 256 | + <input type="text" class="form-control item" id="txtlayerNumber" value="0" ng-model="layerNumber" ng-keyup="LayerValueChangeBasedOnKeyUp($event)" ng-keydown="LayerChangeBasedOnKeyPressed($event)" style="height:32px;border-radius:0;"> |
257 | </div> | 257 | </div> |
258 | <div style="width: 22px; float: left;"> | 258 | <div style="width: 22px; float: left;"> |
259 | <div style="width: 100%; float: left; height: 16px;"> | 259 | <div style="width: 100%; float: left; height: 16px;"> |