javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-23 14:01:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore(scrollView): calculate max scrollTo attempts

Browse Source
This commit is contained in:
Adam Bradley
2016-04-15 20:00:57 -05:00
parent 16e54d8d77
commit 2f342d647e
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,6 +53,7 @@ export class ScrollView {
let xDistance = Math.abs(x - fromX); let xDistance = Math.abs(x - fromX);
let yDistance = Math.abs(y - fromY); let yDistance = Math.abs(y - fromY);
let maxAttempts = (duration / 16) + 100;
return new Promise(resolve => { return new Promise(resolve => {
let startTime: number; let startTime: number;
@ -62,7 +63,7 @@ export class ScrollView {
function step() { function step() {
attempts++; attempts++;
if (!self._el || !self.isPlaying || attempts > 200) { if (!self._el || !self.isPlaying || attempts > maxAttempts) {
self.isPlaying = false; self.isPlaying = false;
resolve(); resolve();
return; return;