From 43e82359dbc8e0387a914117d71c8b01b8e4f5b9 Mon Sep 17 00:00:00 2001 From: Moritz Date: Wed, 22 Nov 2017 16:02:05 -0600 Subject: [PATCH 1/3] v1.5.6 From 7d2f26ff60e22c49a11e2e828f49373c0dc5968d Mon Sep 17 00:00:00 2001 From: Moritz Date: Tue, 28 Nov 2017 13:55:12 -0600 Subject: [PATCH 2/3] mouseover ripple --- scrollimate.js | 72 ++++++++++++++++++++++++++++++++------------------ 1 file changed, 47 insertions(+), 25 deletions(-) diff --git a/scrollimate.js b/scrollimate.js index 892361e..a23ca32 100644 --- a/scrollimate.js +++ b/scrollimate.js @@ -518,36 +518,58 @@ var scrollimate = (function( window, $ ){ var inttype = 'click'; var noclass = false; } - - $('').appendTo($('head')); + + $('').appendTo($('head')); if(!noclass){ $target.addClass('ripplestyles'); + } + + var _execute = function(event, passedthis){ + var $div = $('
'), + btnOffset = $(passedthis).offset(), + xPos = event.pageX - btnOffset.left, + yPos = event.pageY - btnOffset.top; + + $div.addClass('ripple-effect'); + var $ripple = $(".ripple-effect"); + + $ripple.css("height", $(passedthis).height()); + $ripple.css("width", $(passedthis).height()); + var color = $(passedthis).data("ripplecolor") || fallbackcolor; + $div.css({ + top: yPos - ($ripple.height()/2), + left: xPos - ($ripple.width()/2), + background: color + }).appendTo($(passedthis)); + + window.setTimeout(function(){ + $div.remove(); + }, 1500); + } + + var reseter = false; + if(inttype === 'mouseover'){ + + $target.on(inttype, function (event) { + if(reseter === true){ + _execute(event, this); + reseter = false; + } + }); + + $target.on('mouseout', function(){ + reseter = true; + }); + } + else{ + $target.on(inttype, function (event) { + _execute(event, this); + }); } - $target.on(inttype, function (event) { - - var $div = $('
'), - btnOffset = $(this).offset(), - xPos = event.pageX - btnOffset.left, - yPos = event.pageY - btnOffset.top; - - $div.addClass('ripple-effect'); - var $ripple = $(".ripple-effect"); - - $ripple.css("height", $(this).height()); - $ripple.css("width", $(this).height()); - var color = $(this).data("ripplecolor") || fallbackcolor; - $div.css({ - top: yPos - ($ripple.height()/2), - left: xPos - ($ripple.width()/2), - background: color - }).appendTo($(this)); - - window.setTimeout(function(){ - $div.remove(); - }, 1500); - }); + + }; From 03170abe51457c0cef808f0e7f6308458ddde85f Mon Sep 17 00:00:00 2001 From: Moritz Date: Tue, 28 Nov 2017 13:56:18 -0600 Subject: [PATCH 3/3] fixed mouseoever effect bug --- scrollimate.js | 1 - 1 file changed, 1 deletion(-) diff --git a/scrollimate.js b/scrollimate.js index a23ca32..8db965b 100644 --- a/scrollimate.js +++ b/scrollimate.js @@ -550,7 +550,6 @@ var scrollimate = (function( window, $ ){ var reseter = false; if(inttype === 'mouseover'){ - $target.on(inttype, function (event) { if(reseter === true){ _execute(event, this);