From 962578e17fa2a02e80133ea3b092334c124a2f4f Mon Sep 17 00:00:00 2001 From: "Manu Mtz.-Almeida" Date: Mon, 20 Aug 2018 19:34:12 +0200 Subject: [PATCH] fix(content): fix scroll events fixes #15244 --- core/src/components/content/content.tsx | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/core/src/components/content/content.tsx b/core/src/components/content/content.tsx index 3f06e0d966..251cb0fe55 100644 --- a/core/src/components/content/content.tsx +++ b/core/src/components/content/content.tsx @@ -142,17 +142,18 @@ export class Content { private onScroll(ev: UIEvent) { const timeStamp = Date.now(); - const didStart = !this.isScrolling; + const shouldStart = !this.isScrolling; this.lastScroll = timeStamp; - if (didStart) { + if (shouldStart) { this.onScrollStart(); + } if (!this.queued && this.scrollEvents) { this.queued = true; this.queue.read(ts => { this.queued = false; this.detail.event = ev; - updateScrollDetail(this.detail, this.el, ts, didStart); + updateScrollDetail(this.detail, this.scrollEl, ts, shouldStart); this.ionScroll.emit(this.detail); }); } @@ -337,21 +338,22 @@ function getPageElement(el: HTMLElement) { // ******** DOM READ **************** function updateScrollDetail( detail: ScrollDetail, - el: HTMLElement, + el: Element, timestamp: number, - didStart: boolean + shouldStart: boolean ) { const prevX = detail.currentX; const prevY = detail.currentY; const prevT = detail.timeStamp; const currentX = el.scrollLeft; const currentY = el.scrollTop; - if (didStart) { + if (shouldStart) { // remember the start positions detail.startTimeStamp = timestamp; detail.startX = currentX; detail.startY = currentY; detail.velocityX = detail.velocityY = 0; + console.log('hhhhhh'); } detail.timeStamp = timestamp; detail.currentX = detail.scrollLeft = currentX;