ADAM / AIAHTML5

Commit 1ecdea6b22d412f09e02b0ba85bdbe9620e99078

Authored by Amrita Vishnoi
1 parent aafbcbc0

Browser crash issue is resolved.now we are pushing data in ColoredImageSRC array

Inline Side-by-side
Showing 2 changed files with 17 additions and 13 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @1ecdea6
... ... @@ -1421,7 +1421,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1421 1421  
1422 1422 if (isMaskImage == 'N') {
1423 1423  
1424   - if ($scope.isLayerChangeUpDown || $scope.isCalledFromEnter) {
  1424 + if ($scope.isLayerChangeByUpDownKey || $scope.isEnterPressed) {
1425 1425 $scope.ColoredImageSRC.push(
1426 1426 {
1427 1427 "bodyRegionId": bodyRegionId, "SRC": src,
... ... @@ -1748,7 +1748,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1748 1748 //do nothing
1749 1749 }
1750 1750 else {
1751   - if (($scope.isLayerChangeUpDown) || ($scope.isCalledFromEnter)) {
  1751 + if (($scope.isLayerChangeByUpDownKey) || ($scope.isEnterPressed)) {
1752 1752 $scope.ColoredImageSRC.push(
1753 1753 {
1754 1754 "bodyRegionId": bodyRegionId, "SRC": src,
... ... @@ -2514,15 +2514,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2514 2514  
2515 2515 else {
2516 2516  
2517   - if ($scope.isLayerChangeUpDown)
2518   - {
2519   - $scope.isCalledFromEnter = false;
2520   - }
2521   - else
2522   - {
2523   - $scope.isCalledFromEnter = true;
2524   - }
2525   -
  2517 +
2526 2518 //1. Dated:13-07-2016 Issue #4965 : The layer number should not extend beyond its level through layer text box.
2527 2519 var dataLength = $rootScope.BodyLayerData.Layers.DataLayer.length;
2528 2520 if (parseInt($('#txtlayerNumber').val()) > (dataLength - 1)) {
... ... @@ -2568,7 +2560,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2568 2560  
2569 2561 $scope.LayerChangeOnMouseUpDown = function (e)
2570 2562 {
2571   - $scope.isLayerChangeUpDown = true;
  2563 + $scope.isLayerChangeByUpDownKey = true;
2572 2564 $scope.LayerChange();
2573 2565  
2574 2566 }
... ... @@ -7695,6 +7687,18 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
7695 7687  
7696 7688 }
7697 7689  
  7690 + $scope.LayerChangeBasedOnKeyPressed = function (e) {
  7691 +
  7692 + if(e.keyCode==13)
  7693 + {
  7694 + $scope.isEnterPressed = true;
  7695 +
  7696 + $scope.LayerChange();
  7697 + }
  7698 +
  7699 + }
  7700 +
  7701 +
7698 7702  
7699 7703 }]
7700 7704  
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
  View file @1ecdea6
... ... @@ -222,7 +222,7 @@
222 222 </div>
223 223 <div class="">
224 224 <p>
225   - <input class="item" type="number" id="txtlayerNumber" value="0" step="1" min="0" style="width:80px; margin:10px 0 0 15px;" ng-model="layerNumber" ng-change="LayerChange()" ng-click="LayerChangeOnMouseUpDown($event)" />
  225 + <input class="item" type="number" id="txtlayerNumber" value="0" step="1" min="0" style="width:80px; margin:10px 0 0 15px;" ng-model="layerNumber" ng-keydown="LayerChangeBasedOnKeyPressed($event)" ng-click="LayerChangeOnMouseUpDown($event)" />
226 226 </p>
227 227 <div id="layerChangeSlider" style="height:140px;" class="vert_slider " ng-model="layerNumber"></div>
228 228 </div>
... ...