fix(infiniteScroll): ensure infinite doesn't fire when already loading

ionic-team · Jun 1, 2016 · f7b1f37 · f7b1f37
1 parent d57833c
commit f7b1f37
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/components/infinite-scroll/infinite-scroll.ts b/src/components/infinite-scroll/infinite-scroll.ts
@@ -178,8 +178,10 @@ export class InfiniteScroll {
     let distanceFromInfinite = ((d.scrollHeight - infiniteHeight) - d.scrollTop) - reloadY;
     if (distanceFromInfinite < 0) {
       this._zone.run(() => {
-        this.state = STATE_LOADING;
-        this.ionInfinite.emit(this);
+        if (this.state !== STATE_LOADING && this.state !== STATE_DISABLED) {
+          this.state = STATE_LOADING;
+          this.ionInfinite.emit(this);
+        }
       });
       return 5;
     }