fix(infiniteScroll): prevent error on infinite scroll complete with n…

…ative scrolling Closes #3682
ionic-team · May 8, 2015 · 86565e2 · 86565e2
1 parent adea328
commit 86565e2
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/js/angular/controller/infiniteScrollController.js b/js/angular/controller/infiniteScrollController.js
@@ -45,7 +45,8 @@ function($scope, $attrs, $element, $timeout) {
     $timeout(function() {
       if (self.jsScrolling) self.scrollView.resize();
       // only check bounds again immediately if the page isn't cached (scroll el has height)
-      if (self.scrollView.__container && self.scrollView.__container.offsetHeight > 0) {
+      if ((self.jsScrolling && self.scrollView.__container && self.scrollView.__container.offsetHeight > 0) ||
+      !self.jsScrolling) {
         self.checkBounds();
       }
     }, 30, false);