Commit de1d61497d9c9baa17bb310601b429faebd6bbbf
Merge branch 'QA' of http://52.6.196.163/ADAM/AIAHTML5 into goBtnIssue_1
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 | 128 | |
129 | 129 | $scope.moduleLandingData = result; |
130 | 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 | 142 | //console.log(JSON.stringify(result, null, 4)); |
135 | 143 | }, |
136 | 144 | function (error) { |
... | ... | @@ -138,9 +146,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou |
138 | 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 | 152 | //$scope.$on('$viewContentLoaded', function (event) { | ... | ... |