Merge pull request #4667 from zanemcca/fixNativeInfinite

Bug fix for repeated infinite scroll calling after a state change with native scrolling
ionic-team · Dec 6, 2015 · 4d8069b · 4d8069b
2 parents 38a9157 + 3cf3e37
commit 4d8069b
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/js/angular/controller/infiniteScrollController.js b/js/angular/controller/infiniteScrollController.js
@@ -100,13 +100,15 @@ function($scope, $attrs, $element, $timeout) {
     };
     var computedStyle = window.getComputedStyle(self.scrollEl) || {};
     return {
-      left: computedStyle.overflowX === 'scroll' ||
-      computedStyle.overflowX === 'auto' ||
-      self.scrollEl.style['overflow-x'] === 'scroll' ?
+      left: maxValues.left &&
+        (computedStyle.overflowX === 'scroll' ||
+        computedStyle.overflowX === 'auto' ||
+        self.scrollEl.style['overflow-x'] === 'scroll') ?
         calculateMaxValue(maxValues.left) : -1,
-      top: computedStyle.overflowY === 'scroll' ||
-      computedStyle.overflowY === 'auto' ||
-      self.scrollEl.style['overflow-y'] === 'scroll' ?
+      top: maxValues.top &&
+        (computedStyle.overflowY === 'scroll' ||
+        computedStyle.overflowY === 'auto' ||
+        self.scrollEl.style['overflow-y'] === 'scroll' ) ?
         calculateMaxValue(maxValues.top) : -1
     };
   };