javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(ripple): fix remainingTime var reference

Browse Source
This commit is contained in:
Adam Bradley
2015-09-28 12:48:07 -05:00
parent a6fb4ba15d
commit da694c3bd8
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ionic/animations/animation.ts
View File

@@ -624,7 +624,7 @@ class Animate {
}
getCurrentTime() {
return this.ani && this.ani.currentTime;
return (this.ani && this.ani.currentTime) || 0;
}
playbackRate(value) {

11
ionic/components/tap-click/ripple.ts
View File

@@ -41,6 +41,8 @@ export class RippleActivator extends Activator {
radiusDuration: radiusDuration
};
//console.log('outerRadius', outerRadius, 'radiusDuration', radiusDuration, 'size', size)
// expand the circle from the users starting point
// start slow, and when they let up, then speed up the animation
ripple.expand = new Animation(rippleEle, {renderDelay: 0});
@@ -83,7 +85,7 @@ export class RippleActivator extends Activator {
ripple.fade = new Animation(ripple.ele);
ripple.fade
.fadeOut()
.duration(ripple.epxand && ripple.expand.remaingTime || OPACITY_OUT_DURATION)
.duration(ripple.epxand && ripple.expand.remainingTime || OPACITY_OUT_DURATION)
.playbackRate(1)
.onFinish(() => {
ripple.fade && ripple.fade.dispose();
@@ -106,8 +108,7 @@ export class RippleActivator extends Activator {
ripple = this.ripples[rippleId];
if ((ripple.expanded && ripple.faded && ripple.ele) ||
forceComplete ||
parseInt(rippleId) + 5000 < Date.now()) {
forceComplete || parseInt(rippleId) + 5000 < Date.now()) {
// finished expanding and the user has lifted the pointer
raf(() => {
this.remove(rippleId);
@@ -136,5 +137,5 @@ export class RippleActivator extends Activator {
const TOUCH_DOWN_ACCEL = 512;
const OPACITY_OUT_DURATION = 750;
const EXPAND_OUT_PLAYBACK_RATE = 3.5;
const DOWN_PLAYBACK_RATE = 0.65;
const EXPAND_OUT_PLAYBACK_RATE = 2.5;
const DOWN_PLAYBACK_RATE = 0.45;