From da694c3bd861016cc4a827bf385c319f2614a399 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Mon, 28 Sep 2015 12:48:07 -0500
Subject: [PATCH] fix(ripple): fix remainingTime var reference

---
 ionic/animations/animation.ts        |  2 +-
 ionic/components/tap-click/ripple.ts | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/ionic/animations/animation.ts b/ionic/animations/animation.ts
index 8ff86f6311..04f946ec89 100644
--- a/ionic/animations/animation.ts
+++ b/ionic/animations/animation.ts
@@ -624,7 +624,7 @@ class Animate {
   }
 
   getCurrentTime() {
-    return this.ani && this.ani.currentTime;
+    return (this.ani && this.ani.currentTime) || 0;
   }
 
   playbackRate(value) {
diff --git a/ionic/components/tap-click/ripple.ts b/ionic/components/tap-click/ripple.ts
index 2d78a26c7f..a590cea55b 100644
--- a/ionic/components/tap-click/ripple.ts
+++ b/ionic/components/tap-click/ripple.ts
@@ -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;