From 5b249397d5d82ae88ab53b424881d50ccdd0bc03 Mon Sep 17 00:00:00 2001 From: FezVrasta Date: Thu, 2 Oct 2014 09:36:03 +0200 Subject: [PATCH] fix for #18 , credits to @waylaidwanderer --- scripts/ripples.js | 7 ++++--- template/material/scripts/ripples.js | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/scripts/ripples.js b/scripts/ripples.js index 1f518ff2..052c8295 100644 --- a/scripts/ripples.js +++ b/scripts/ripples.js @@ -71,7 +71,6 @@ var ripples = { }; var rippleOut = function($ripple) { - console.log($ripple); // Clear previous animation $ripple.className = "ripple ripple-on ripple-out"; @@ -109,12 +108,14 @@ var ripples = { // init RippleJS and start ripple effect on mousedown bind("mouseover", withRipple, rippleInit); - console.log(withRipple); // start ripple effect on mousedown bind("mousedown", ".ripple-wrapper", rippleStart); // if animation ends and user is not holding mouse then destroy the ripple bind("rippleEnd", ".ripple-wrapper .ripple", function(e, $ripple) { - if (!mouseDown) { + + var $ripples = $ripple.parentNode.getElementsByClassName("ripple"); + + if (!mouseDown || ( $ripples[0] == $ripple && $ripples.length > 1)) { rippleOut($ripple); } }); diff --git a/template/material/scripts/ripples.js b/template/material/scripts/ripples.js index 1f518ff2..052c8295 100644 --- a/template/material/scripts/ripples.js +++ b/template/material/scripts/ripples.js @@ -71,7 +71,6 @@ var ripples = { }; var rippleOut = function($ripple) { - console.log($ripple); // Clear previous animation $ripple.className = "ripple ripple-on ripple-out"; @@ -109,12 +108,14 @@ var ripples = { // init RippleJS and start ripple effect on mousedown bind("mouseover", withRipple, rippleInit); - console.log(withRipple); // start ripple effect on mousedown bind("mousedown", ".ripple-wrapper", rippleStart); // if animation ends and user is not holding mouse then destroy the ripple bind("rippleEnd", ".ripple-wrapper .ripple", function(e, $ripple) { - if (!mouseDown) { + + var $ripples = $ripple.parentNode.getElementsByClassName("ripple"); + + if (!mouseDown || ( $ripples[0] == $ripple && $ripples.length > 1)) { rippleOut($ripple); } });