Commit fd8bcd0df217be9455f8041c89b4fec2454d3e83
Merge branch 'AAGridViewScrollissue' of http://52.6.196.163/ADAM/AIAHTML5 into QA
Showing
1 changed file
with
12 additions
and
6 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
| @@ -128,9 +128,17 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | @@ -128,9 +128,17 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | ||
| 128 | 128 | ||
| 129 | $scope.moduleLandingData = result; | 129 | $scope.moduleLandingData = result; |
| 130 | // setTimeout(function () { $('#' + $rootScope.highlightid).find('.thumbnail').addClass('hightlightstate'); }, 100); | 130 | // setTimeout(function () { $('#' + $rootScope.highlightid).find('.thumbnail').addClass('hightlightstate'); }, 100); |
| 131 | - if ($rootScope.getLocalStorageValue('AAGridViewHighlightThumbnail') !== null) { | ||
| 132 | - setTimeout(function () { $('#' + $rootScope.getLocalStorageValue("AAGridViewHighlightThumbnail")).find('.thumbnail').addClass('HightLightThumbnail'); }, 100); | ||
| 133 | - } | 131 | + |
| 132 | + setTimeout(function () | ||
| 133 | + { | ||
| 134 | + if ($rootScope.getLocalStorageValue('AAGridViewHighlightThumbnail') !== null) { | ||
| 135 | + $('#' + $rootScope.getLocalStorageValue("AAGridViewHighlightThumbnail")).find('.thumbnail').addClass('HightLightThumbnail'); | ||
| 136 | + } | ||
| 137 | + if ($rootScope.getLocalStorageValue('AAGridViewScroll') !== null) { | ||
| 138 | + $('html, body').animate({ scrollTop: $rootScope.getLocalStorageValue('AAGridViewScroll') }, 'slow'); | ||
| 139 | + } | ||
| 140 | + }, 100); | ||
| 141 | + | ||
| 134 | //console.log(JSON.stringify(result, null, 4)); | 142 | //console.log(JSON.stringify(result, null, 4)); |
| 135 | }, | 143 | }, |
| 136 | function (error) { | 144 | function (error) { |
| @@ -138,9 +146,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | @@ -138,9 +146,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | ||
| 138 | console.log(' error: ' + error.statusText); | 146 | console.log(' error: ' + error.statusText); |
| 139 | } | 147 | } |
| 140 | ) | 148 | ) |
| 141 | - if ($rootScope.getLocalStorageValue('AAGridViewScroll') !== null) { | ||
| 142 | - $('html, body').animate({ scrollTop: $rootScope.getLocalStorageValue('AAGridViewScroll') }, 'slow'); | ||
| 143 | - } | 149 | + |
| 144 | } | 150 | } |
| 145 | 151 | ||
| 146 | //$scope.$on('$viewContentLoaded', function (event) { | 152 | //$scope.$on('$viewContentLoaded', function (event) { |