From 5a0584df0ec5cb1ab7c59507b5ee539fe0ceacbf Mon Sep 17 00:00:00 2001 From: Max Lynch Date: Fri, 25 Sep 2015 12:46:14 -0500 Subject: [PATCH] Ripple tweaks --- ionic/animations/animation.ts | 2 +- ionic/components/tap-click/ripple.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ionic/animations/animation.ts b/ionic/animations/animation.ts index 1549353008..c88febc0eb 100644 --- a/ionic/animations/animation.ts +++ b/ionic/animations/animation.ts @@ -620,7 +620,7 @@ class Animate { } getCurrentTime() { - return this.ani.currentTime; + return this.ani && this.ani.currentTime; } playbackRate(value) { diff --git a/ionic/components/tap-click/ripple.ts b/ionic/components/tap-click/ripple.ts index 240de2d71a..9f770d3b65 100644 --- a/ionic/components/tap-click/ripple.ts +++ b/ionic/components/tap-click/ripple.ts @@ -11,8 +11,8 @@ export class RippleActivator extends Activator { static OPACITY_OUT_DURATION = 750; - static EXPAND_OUT_PLAYBACK_RATE = 2; - static DOWN_PLAYBACK_RATE = 0.45; + static EXPAND_OUT_PLAYBACK_RATE = 3.5; + static DOWN_PLAYBACK_RATE = 0.65; static OPACITY_OUT_PLAYBACK_RATE = 1; constructor(app, config) {