From 04d9f5abc3bb568b57c7112af9c550641f9d0569 Mon Sep 17 00:00:00 2001 From: "Manu Mtz.-Almeida" Date: Wed, 7 Dec 2016 23:25:40 +0100 Subject: [PATCH] fix(app): setScrolling() --- src/components/app/app.ts | 4 ++-- src/components/content/content.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/app/app.ts b/src/components/app/app.ts index 4ce583d191..7ca988bbbc 100644 --- a/src/components/app/app.ts +++ b/src/components/app/app.ts @@ -162,8 +162,8 @@ export class App { /** * @private */ - setScrolling(timeStamp: number) { - this._scrollTime = timeStamp + ACTIVE_SCROLLING_TIME; + setScrolling() { + this._scrollTime = Date.now() + ACTIVE_SCROLLING_TIME; } /** diff --git a/src/components/content/content.ts b/src/components/content/content.ts index 94173f90bd..437ae7604b 100644 --- a/src/components/content/content.ts +++ b/src/components/content/content.ts @@ -341,7 +341,7 @@ export class Content extends Ion implements OnDestroy, OnInit { // subscribe to every scroll move this._scroll.scroll.subscribe(ev => { // remind the app that it's currently scrolling - this._app.setScrolling(ev.timeStamp); + this._app.setScrolling(); // emit to all of our other friends things be scrolling this.ionScroll.emit(ev);