Commit a1c75d427ce0836bbcfb503342d53562262aa134
Merge branch 'Bug#16709' into Develop
Showing
1 changed file
with
6 additions
and
11 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
| @@ -1437,9 +1437,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -1437,9 +1437,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
| 1437 | FlipedImgCanvas.style.visibility = 'visible' | 1437 | FlipedImgCanvas.style.visibility = 'visible' |
| 1438 | } | 1438 | } |
| 1439 | else { | 1439 | else { |
| 1440 | - if ($rootScope.isHighLight == true && $rootScope.isZoomed == false) { | ||
| 1441 | - FlipedImgCanvas.style.visibility = 'hidden'; | ||
| 1442 | - } | 1440 | + //if ($rootScope.isHighLight == true && $rootScope.isZoomed == false) { |
| 1441 | + // FlipedImgCanvas.style.visibility = 'hidden'; | ||
| 1442 | + //} | ||
| 1443 | } | 1443 | } |
| 1444 | } | 1444 | } |
| 1445 | 1445 | ||
| @@ -1743,13 +1743,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -1743,13 +1743,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
| 1743 | 1743 | ||
| 1744 | $rootScope.isLoading = true; | 1744 | $rootScope.isLoading = true; |
| 1745 | $('#spinner').css('visibility', 'visible'); | 1745 | $('#spinner').css('visibility', 'visible'); |
| 1746 | - //$timeout(function () { | ||
| 1747 | - console.log('inside start of flipped. $scope.ColoredImageSRC.length= ' + $scope.ColoredImageSRC.length) | ||
| 1748 | $rootScope.isHighLight = true; | 1746 | $rootScope.isHighLight = true; |
| 1749 | - console.log('in FlipedImgCanvas just before highLightBody call'); | ||
| 1750 | $scope.highLightBody(); | 1747 | $scope.highLightBody(); |
| 1751 | - console.log('just after highLightBody call'); | ||
| 1752 | - //}, 500); | ||
| 1753 | } | 1748 | } |
| 1754 | } | 1749 | } |
| 1755 | else { | 1750 | else { |
| @@ -1828,9 +1823,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -1828,9 +1823,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
| 1828 | } | 1823 | } |
| 1829 | else { | 1824 | else { |
| 1830 | 1825 | ||
| 1831 | - if ($rootScope.isHighLight == true && $rootScope.isZoomed == false) { | ||
| 1832 | - imgCanvas.style.visibility = 'hidden'; | ||
| 1833 | - } | 1826 | + //if ($rootScope.isHighLight == true && $rootScope.isZoomed == false) { |
| 1827 | + // imgCanvas.style.visibility = 'hidden'; | ||
| 1828 | + //} | ||
| 1834 | } | 1829 | } |
| 1835 | 1830 | ||
| 1836 | } | 1831 | } |