fix(collectionRepeat): correctly save user scroll position on back

Addresses #1157
ionic-team · May 5, 2014 · 0a64075 · 0a64075
1 parent e6e1896
commit 0a64075
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/js/angular/controller/scrollController.js b/js/angular/controller/scrollController.js
@@ -76,15 +76,17 @@ function($scope, scrollViewOptions, $timeout, $window, $$scrollValueCache, $loca
 
     var viewId = historyData && historyData.viewId;
     if (viewId) {
-      self.rememberScrollPosition(viewId);
-      self.scrollToRememberedPosition();
-
-      backListenDone = $rootScope.$on('$viewHistory.viewBack', function(e, fromViewId, toViewId) {
-        //When going back from this view, forget its saved scroll position
-        if (viewId === fromViewId) {
-          self.forgetScrollPosition();
-        }
-      });
+      $timeout(function() {
+        self.rememberScrollPosition(viewId);
+        self.scrollToRememberedPosition();
+
+        backListenDone = $rootScope.$on('$viewHistory.viewBack', function(e, fromViewId, toViewId) {
+          //When going back from this view, forget its saved scroll position
+          if (viewId === fromViewId) {
+            self.forgetScrollPosition();
+          }
+        });
+      }, 1, false);
     }
   });
 

diff --git a/test/unit/angular/controller/scrollController.unit.js b/test/unit/angular/controller/scrollController.unit.js
@@ -124,11 +124,12 @@ describe('$ionicScroll Controller', function() {
     expect(ctrl.scrollToRememberedPosition).toHaveBeenCalled();
   });
 
-  it('should forget on $viewHistory.viewBack after $viewContentLoaded', inject(function($rootScope) {
+  it('should forget on $viewHistory.viewBack after $viewContentLoaded', inject(function($rootScope, $timeout) {
     var historyData = { viewId: 'foo' };
     setup();
     spyOn($rootScope, '$on').andCallThrough();;
     scope.$broadcast('$viewContentLoaded', historyData);
+    $timeout.flush();
     expect(scope.$on).toHaveBeenCalledWith('$viewHistory.viewBack', jasmine.any(Function));
 
     //Should not forget unless backViewId is the same