ADAM / AIAHTML5

Commit 00a3c44f2b5e3d45100f33f0d443bdb004831e2b

Authored by Amrita Vishnoi
1 parent 2cb60e3b

Stabilized Develop branch back which has been disturbed after Nikita merge.

Inline Side-by-side
Showing 1 changed file with 6 additions and 11 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @00a3c44
... ... @@ -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.isLayerChangeByUpDownKey || $scope.isEnterPressed) {
  1424 +
1425 1425 $scope.ColoredImageSRC.push(
1426 1426 {
1427 1427 "bodyRegionId": bodyRegionId, "SRC": src,
... ... @@ -1432,7 +1432,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1432 1432 "haveMirror": 'true'
1433 1433 }
1434 1434 );
1435   - }
  1435 +
1436 1436  
1437 1437 // console.log('$rootScope.isListManagerSelected= ' + $rootScope.isListManagerSelected + ' length= ' + $scope.ColoredImageSRC.length)
1438 1438  
... ... @@ -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.isLayerChangeByUpDownKey) || ($scope.isEnterPressed)) {
  1751 +
1752 1752 $scope.ColoredImageSRC.push(
1753 1753 {
1754 1754 "bodyRegionId": bodyRegionId, "SRC": src,
... ... @@ -1760,7 +1760,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1760 1760 }
1761 1761  
1762 1762 );
1763   - }
  1763 +
1764 1764  
1765 1765 if (($scope.ColoredImageSRC != null || $scope.ColoredImageSRC != undefined)) {
1766 1766  
... ... @@ -2560,7 +2560,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2560 2560  
2561 2561 $scope.LayerChangeOnMouseUpDown = function (e)
2562 2562 {
2563   - $scope.isLayerChangeByUpDownKey = true;
  2563 +
2564 2564 $scope.LayerChange();
2565 2565  
2566 2566 }
... ... @@ -7661,15 +7661,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
7661 7661  
7662 7662 if(e.keyCode==13)
7663 7663 {
7664   - $scope.isEnterPressed = true;
7665   -
7666   - $scope.LayerChange();
  7664 + $scope.LayerChange();
7667 7665 }
7668 7666  
7669 7667 }
7670   -
7671   -
7672   -
7673 7668 }]
7674 7669  
7675 7670 );
7676 7671 \ No newline at end of file
... ...