Commit 09d6309121efbdb4e115164560faa395a71d4050
stateMaintainhighlightAll code merge
Showing
4 changed files
with
33 additions
and
4 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
| ... | ... | @@ -173,7 +173,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout |
| 173 | 173 | }); |
| 174 | 174 | |
| 175 | 175 | }); |
| 176 | - | |
| 176 | + $('#' + localStorage.getItem("currentBodyViewId")).find('.thumbnail').addClass('HightLightThumbnail'); | |
| 177 | 177 | }, |
| 178 | 178 | function (error) { |
| 179 | 179 | // handle errors here | ... | ... |
400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
| ... | ... | @@ -197,7 +197,9 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout |
| 197 | 197 | // }); |
| 198 | 198 | |
| 199 | 199 | //}); |
| 200 | - | |
| 200 | + $timeout(function () { $('#' + localStorage.getItem("currentBodyViewId")).find('.thumbnail').addClass('HightLightThumbnail'); }, 100); | |
| 201 | + | |
| 202 | + | |
| 201 | 203 | $timeout(function () { $('#ciSpinner').css('visibility', 'hidden'); }, 300); |
| 202 | 204 | }, |
| 203 | 205 | function (error) { | ... | ... |
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
| ... | ... | @@ -86,6 +86,19 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou |
| 86 | 86 | var moduleItemDataToBeSavedID = localStorage.getItem("listViewSelectedID"); |
| 87 | 87 | $("#list-view table tbody #" + moduleItemDataToBeSavedID).addClass("active"); |
| 88 | 88 | $scope.isListViewButtonClicked = true; |
| 89 | + var curAAListViewScroll = localStorage.getItem("AAListViewScroll"); | |
| 90 | + | |
| 91 | + if (typeof (curAAListViewScroll) !== "undefined" && curAAListViewScroll !== null && curAAListViewScroll !== '') { | |
| 92 | + if (typeof InstallTrigger !== 'undefined') { | |
| 93 | + | |
| 94 | + $('#list-view table tbody').animate({ scrollTop: localStorage.getItem("AAListViewScroll") }); | |
| 95 | + } | |
| 96 | + else { | |
| 97 | + | |
| 98 | + $('#list-view table tbody').scrollTop(localStorage.getItem("AAListViewScroll")); | |
| 99 | + } | |
| 100 | + | |
| 101 | + } | |
| 89 | 102 | // } |
| 90 | 103 | }, 2000); |
| 91 | 104 | } |
| ... | ... | @@ -107,7 +120,10 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou |
| 107 | 120 | function (result) { |
| 108 | 121 | |
| 109 | 122 | $scope.moduleLandingData = result; |
| 110 | - | |
| 123 | + // setTimeout(function () { $('#' + $rootScope.highlightid).find('.thumbnail').addClass('hightlightstate'); }, 100); | |
| 124 | + if (localStorage.getItem('AAGridViewHighlightThumbnail') !== null) { | |
| 125 | + setTimeout(function () { $('#' + localStorage.getItem("AAGridViewHighlightThumbnail")).find('.thumbnail').addClass('HightLightThumbnail'); }, 100); | |
| 126 | + } | |
| 111 | 127 | //console.log(JSON.stringify(result, null, 4)); |
| 112 | 128 | }, |
| 113 | 129 | function (error) { |
| ... | ... | @@ -128,7 +144,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou |
| 128 | 144 | $scope.isOpenBtnClicked = false; |
| 129 | 145 | $scope.openModuleItemView = function (event) { |
| 130 | 146 | $rootScope.MenuModuleName = "AA"; |
| 131 | - localStorage.setItem("activeTab", $scope.activeTab); | |
| 147 | + localStorage.setItem("activeTab", $scope.activeTab); | |
| 132 | 148 | //0. Get selected Image Id |
| 133 | 149 | if ($scope.isListViewButtonClicked == true) { |
| 134 | 150 | if ($scope.isOpenBtnClicked == true) { |
| ... | ... | @@ -163,6 +179,8 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou |
| 163 | 179 | //3. set opened module item ti |
| 164 | 180 | localStorage.setItem("currentViewTitle", $rootScope.OpenedTileData[6]); |
| 165 | 181 | localStorage.setItem("AAGridViewScroll", $($window).scrollTop()); |
| 182 | + localStorage.setItem("AAGridViewHighlightThumbnail", $(event.target).parent().parent().parent().attr('id')); | |
| 183 | + | |
| 166 | 184 | //3. Navigate to the Module-item-view |
| 167 | 185 | var u = $location.url(); |
| 168 | 186 | $location.url('/module-item-view'); |
| ... | ... | @@ -176,6 +194,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou |
| 176 | 194 | $("#list-view table tbody tr").removeClass("active"); |
| 177 | 195 | localStorage.setItem("listViewSelectedID", moduleItemDataToBeSavedID); |
| 178 | 196 | $("#list-view table tbody #" + moduleItemDataToBeSavedID).addClass("active"); |
| 197 | + localStorage.setItem("AAListViewScroll", $("#list-view table tbody").scrollTop()); | |
| 179 | 198 | var moduleItemDataToBeSaved = $("#list-view table tbody #" + moduleItemDataToBeSavedID).find('td:eq(0)').text(); |
| 180 | 199 | $rootScope.OpenedTileData = ModuleService.GetOpenedTileData(moduleItemDataToBeSaved, $scope.moduleLandingData); |
| 181 | 200 | $rootScope.OpenItemImagePath = "../../../content/images/aa/images/" + $rootScope.OpenedTileData[3]; | ... | ... |
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css