Merge branch 'TransparencyLevelDefect' into Develop

Nikita Kulshreshtha
2 parents 055f2366 e165b8c7
Showing 2 changed files with 92 additions and 20 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
@@ -2639,30 +2639,55 @@ 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);
+                  //  $rootScope.PreviouslayerNumbr = $scope.layerNumber;
+               
+            }
+            else {
+                var layerInputVal = $("#txtlayerNumber").val();
+                if (layerInputVal != $rootScope.totalLayers) {
+                    var layerInputValInc = parseInt(layerInputVal) + 1;
+                    $scope.layerNumber = parseInt(layerInputValInc);
+                    $("#txtlayerNumber").val($scope.layerNumber);
+                    $rootScope.PreviouslayerNumbr = $scope.layerNumber;
+                }
  
-            var layerInputVal = $("#txtlayerNumber").val();
-            if (layerInputVal != $rootScope.totalLayers) {
-                var layerInputValInc = parseInt(layerInputVal) + 1;
-                $scope.layerNumber = parseInt(layerInputValInc);
-                $("#txtlayerNumber").val($scope.layerNumber);
             }
  
         }
         else {
  
-            var layerInputVal = $("#txtlayerNumber").val();
-            if (layerInputVal > 0) {
-                var layerInputValDec = parseInt(layerInputVal) - 1;
+            //Dissectible Anatomy > Inappropriate Text in Layer Input box.
+            if ($("#txtlayerNumber").val() == '') {
+                var layerInputVal = 0;
+                var layerInputValDec = parseInt(layerInputVal);
                 $scope.layerNumber = parseInt(layerInputValDec);
                 $("#txtlayerNumber").val($scope.layerNumber);
-            }
-
+             //   $rootScope.PreviouslayerNumbr = $scope.layerNumber;
  
+            }
+            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();
  
@@ -8332,15 +8357,29 @@ 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) {
-            $scope.LayerChange();
+         
+            if ($("#txtlayerNumber").val() == '')
+            {
+               
+                $("#txtlayerNumber").val($rootScope.PreviouslayerNumbr);
+           }
+            else
+            {
+                $rootScope.PreviouslayerNumbr = $("#txtlayerNumber").val();
+                $scope.LayerChange();
+            }
+            
+         
         }
  
         // 'x' button is displaying inside the input box in IE browser.
-        if (e.which == 38) {
+        if (e.keyCode == 38) {
  
  
             var layerInputVal = $("#txtlayerNumber").val();
@@ -8348,26 +8387,55 @@ 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;
             }
  
  
         }
  
         // 'x' button is displaying inside the input box in IE browser.
-        if (e.which == 40) {
+        if (e.keyCode == 40) {
             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.LayerValueChangeBasedOnKeyUp = function (e) {
+  
+        var keyUplayerNumber = parseInt($("#txtlayerNumber").val());
+    
+        if (isNaN(keyUplayerNumber))
+        {
+            
+        }
+        else {
+
+            if (keyUplayerNumber > $rootScope.totalLayers) {
+
+                $("#txtlayerNumber").val($rootScope.totalLayers);
+                $scope.layerNumber = parseInt($rootScope.totalLayers);
+              
+            }
+            else {
+
+                $("#txtlayerNumber").val(keyUplayerNumber);
+                $scope.layerNumber = parseInt(keyUplayerNumber);
+               
+
+            }
+
+        }
+
+
+    }
+
  
  
 }]
@@ -253,7 +253,7 @@
             <!--'x' button is displaying inside the input box in IE browser.-->
             <div style="width:80px;margin:10px 0 0 15px;display:inline-block;">
                 <div style="width: 58px; float: left;">
-                    <input type="text" class="form-control item" id="txtlayerNumber" value="0" ng-model="layerNumber" ng-keydown="LayerChangeBasedOnKeyPressed($event)" style="height:32px;border-radius:0;">
+                    <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;">
                 </div>
                 <div style="width: 22px; float: left;">
                     <div style="width: 100%; float: left; height: 16px;">
@@ -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;
             }