javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-22 05:21:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(scroll): correctly resolve when scrolling finishes

Browse Source
This commit is contained in:
Adam Bradley
2016-04-06 10:10:34 -05:00
parent 0a5f351699
commit 35a3357df8
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ionic/util/scroll-view.ts
View File

@ -56,11 +56,16 @@ export class ScrollView {
return new Promise(resolve => { return new Promise(resolve => {
let startTime: number; let startTime: number;
let attempts = 0;
// scroll loop // scroll loop
function step() { function step() {
if (!self._el || !self.isPlaying) { attempts++;
return resolve();
if (!self._el || !self.isPlaying || attempts > 200) {
self.isPlaying = false;
resolve();
return;
} }
let time = Math.min(1, ((Date.now() - startTime) / duration)); let time = Math.min(1, ((Date.now() - startTime) / duration));
@ -74,10 +79,10 @@ export class ScrollView {
} }
if (fromX != x) { if (fromX != x) {
self._el.scrollLeft = Math.round((easedT * (x - fromX)) + fromX); self._el.scrollLeft = Math.floor((easedT * (x - fromX)) + fromX);
} }
if (time < 1 && self.isPlaying) { if (easedT < 1) {
raf(step); raf(step);
} else { } else {