Commit 8aa20a6706a72a9c639da50645e135b24774d29d
Merge branch 'highlightStateMaintain' into Develop
Showing
1 changed file
with
4 additions
and
3 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
| @@ -1471,7 +1471,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -1471,7 +1471,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
| 1471 | 1471 | ||
| 1472 | FlipedImgCanvas.addEventListener('click', function (evt) { | 1472 | FlipedImgCanvas.addEventListener('click', function (evt) { |
| 1473 | 1473 | ||
| 1474 | - | 1474 | + var canvasDiv = document.getElementById('canvasDiv'); |
| 1475 | + $scope.imageVerticalScrollPosition = canvasDiv.scrollTop; | ||
| 1475 | //to get correct data on multihighlight highlight | 1476 | //to get correct data on multihighlight highlight |
| 1476 | if ($scope.isLayerChange == true) { | 1477 | if ($scope.isLayerChange == true) { |
| 1477 | $scope.isLayerChange = false; | 1478 | $scope.isLayerChange = false; |
| @@ -1872,8 +1873,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -1872,8 +1873,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
| 1872 | } | 1873 | } |
| 1873 | 1874 | ||
| 1874 | imgCanvas.addEventListener('click', function (evt) { | 1875 | imgCanvas.addEventListener('click', function (evt) { |
| 1875 | - | ||
| 1876 | - | 1876 | + var canvasDiv = document.getElementById('canvasDiv'); |
| 1877 | + $scope.imageVerticalScrollPosition = canvasDiv.scrollTop; | ||
| 1877 | if ($scope.isLayerChange == true) { | 1878 | if ($scope.isLayerChange == true) { |
| 1878 | $scope.isLayerChange = false; | 1879 | $scope.isLayerChange = false; |
| 1879 | } | 1880 | } |