From fc8da3bc5af213331d93c76ff6ba4cae3d1aeb56 Mon Sep 17 00:00:00 2001 From: Joel Date: Thu, 18 Sep 2014 13:54:05 -0700 Subject: [PATCH] Fixes #18 by directly calling rippleOut instead of using dispatchEvent --- scripts/ripples.js | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/scripts/ripples.js b/scripts/ripples.js index e21b6839..29782630 100644 --- a/scripts/ripples.js +++ b/scripts/ripples.js @@ -34,7 +34,6 @@ var ripples = { elPos = $el.getBoundingClientRect(), mousePos = {x: e.clientX - elPos.left, y: e.clientY - elPos.top}, scale = "transform:scale(" + Math.round($rippleWrapper.offsetWidth / 5) + ")", - rippleEnd = new CustomEvent("rippleEnd", {detail: $ripple}), refreshElementStyle; // Set ripple class @@ -66,7 +65,7 @@ var ripples = { // Let know to other functions that this element has finished the animation $ripple.dataset.animating = 0; - document.dispatchEvent(rippleEnd); + rippleOut($ripple); }, rippleStartTime); @@ -110,12 +109,7 @@ var ripples = { // start ripple effect on mousedown bind("mousedown", ".ripple-wrapper, .ripple-wrapper .ripple", rippleStart); - // if animation ends and user is not holding mouse then destroy the ripple - bind("rippleEnd", ".ripple-wrapper, .ripple-wrapper .ripple", function(e, $ripple) { - if (!mouseDown) { - rippleOut($ripple); - } - }); + // Destroy ripple when mouse is not holded anymore if the ripple still exists bind("mouseup", ".ripple-wrapper, .ripple-wrapper .ripple", function(e, $ripple) { if ($ripple.dataset.animating != 1) {