fix(infiniteScroll): prevent checkbounds when infinitescroll complete…

…s when page is cached. Fixes #2694
ionic-team · Apr 16, 2015 · 6ee9e26 · 6ee9e26
1 parent c602cde
commit 6ee9e26
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/js/angular/controller/infiniteScrollController.js b/js/angular/controller/infiniteScrollController.js
@@ -44,7 +44,10 @@ function($scope, $attrs, $element, $timeout) {
     });
     $timeout(function() {
       if (self.jsScrolling) self.scrollView.resize();
-      self.checkBounds();
+      // only check bounds again immediately if the page isn't cached (scroll el has height)
+      if (self.scrollView.__container && self.scrollView.__container.offsetHeight > 0) {
+        self.checkBounds();
+      }
     }, 30, false);
     self.isLoading = false;
   }
@@ -116,4 +119,7 @@ function($scope, $attrs, $element, $timeout) {
     maximum - parseFloat(distance);
   }
 
+  //for testing
+  self.__finishInfiniteScroll = finishInfiniteScroll;
+
 }]);
diff --git a/test/unit/angular/directive/infiniteScroll.unit.js b/test/unit/angular/directive/infiniteScroll.unit.js
@@ -316,6 +316,23 @@ describe('ionicInfiniteScroll directive', function() {
     expect(el.controller('ionInfiniteScroll').checkBounds).not.toHaveBeenCalled();
   }));
 
+  it('should checkbounds on complete if the page is still active', inject(function($timeout) {
+    var el = setupJS();
+
+    el.controller('ionInfiniteScroll').scrollView.__container = {offsetHeight:50};
+    spyOn(el.controller('ionInfiniteScroll'),'checkBounds');
+    el.controller('ionInfiniteScroll').__finishInfiniteScroll();
+    $timeout.flush();
+    expect(el.controller('ionInfiniteScroll').checkBounds).toHaveBeenCalled();
+    expect(el.controller('ionInfiniteScroll').checkBounds.callCount).toBe(2);
+
+    el.controller('ionInfiniteScroll').scrollView.__container = {offsetHeight:0};
+    el.controller('ionInfiniteScroll').__finishInfiniteScroll();
+    $timeout.flush();
+    expect(el.controller('ionInfiniteScroll').checkBounds.callCount).toBe(2);
+
+  }));
+
   it('scroll.infiniteScrollComplete should work', inject(function($timeout) {
     var el = setupJS();
     ctrl.isLoading = true;