From f7b1f373d3ae347d12dfd770e84c6135accab454 Mon Sep 17 00:00:00 2001 From: Adam Bradley Date: Tue, 31 May 2016 22:07:37 -0500 Subject: [PATCH] fix(infiniteScroll): ensure infinite doesn't fire when already loading --- src/components/infinite-scroll/infinite-scroll.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/components/infinite-scroll/infinite-scroll.ts b/src/components/infinite-scroll/infinite-scroll.ts index d661ada5e3..4b25d3fd17 100644 --- 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; }