From ec97f4953b6cfba1e6f58940f80ad64258f26028 Mon Sep 17 00:00:00 2001 From: martingg88 Date: Sun, 18 Oct 2015 16:08:12 +0800 Subject: [PATCH] prevent event from bubbling up --- dist/jquery.animatecss.js | 5 +++-- dist/jquery.animatecss.min.js | 4 ++-- src/animatecss.coffee | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dist/jquery.animatecss.js b/dist/jquery.animatecss.js index 32bb217..be4b6c4 100644 --- a/dist/jquery.animatecss.js +++ b/dist/jquery.animatecss.js @@ -1,4 +1,4 @@ -/*! animateCSS - v1.2.1 - 2015-03-23 +/*! animateCSS - v1.2.1 - 2015-10-18 * https://github.com/craigmdennis/animateCSS * Copyright (c) 2015 Craig Dennis; Licensed MIT */ @@ -67,7 +67,8 @@ } }; complete = function(element) { - return element.one(transitionEnd, function() { + return element.one(transitionEnd, function(event) { + event.stopPropagation(); return callback(element); }); }; diff --git a/dist/jquery.animatecss.min.js b/dist/jquery.animatecss.min.js index 8373b7a..8427783 100644 --- a/dist/jquery.animatecss.min.js +++ b/dist/jquery.animatecss.min.js @@ -1,5 +1,5 @@ -/*! animateCSS - v1.2.1 - 2015-03-23 +/*! animateCSS - v1.2.1 - 2015-10-18 * https://github.com/craigmdennis/animateCSS * Copyright (c) 2015 Craig Dennis; Licensed MIT */ -(function(){"use strict";var a;a=jQuery,a.fn.extend({animateCSS:function(b,c){var d,e,f,g,h,i,j,k,l,m;return k={effect:b,delay:0,animationClass:"animated",infinite:!1,callback:c,duration:1e3,debug:!1},l="webkitAnimationEnd mozAnimationEnd MSAnimationEnd oanimationend animationend",k=a.extend(k,c),h=function(a){return e(a)},e=function(a){return k.infinite===!0&&(k.animationClass+=" infinite"),setTimeout(function(){return j(a),m(a),d(a),g(a)},k.delay)},d=function(a){return a.addClass(k.effect+" "+k.animationClass+" ")},m=function(a){return"hidden"===a.css("visibility")&&a.css("visibility","visible"),a.is(":hidden")?a.show():void 0},i=function(a){return a.removeClass(k.effect+" "+k.animationClass)},j=function(a){return a.css({"-webkit-animation-duration":k.duration+"ms","-moz-animation-duration":k.duration+"ms","-o-animation-duration":k.duration+"ms","animation-duration":k.duration+"ms"})},f=function(a){return k.infinite===!1&&i(a),"function"==typeof k.callback?k.callback.call(a):void 0},g=function(a){return a.one(l,function(){return f(a)})},this.each(function(){return h(a(this))})}})}).call(this); \ No newline at end of file +(function(){"use strict";var a;a=jQuery,a.fn.extend({animateCSS:function(b,c){var d,e,f,g,h,i,j,k,l,m;return k={effect:b,delay:0,animationClass:"animated",infinite:!1,callback:c,duration:1e3,debug:!1},l="webkitAnimationEnd mozAnimationEnd MSAnimationEnd oanimationend animationend",k=a.extend(k,c),h=function(a){return e(a)},e=function(a){return k.infinite===!0&&(k.animationClass+=" infinite"),setTimeout(function(){return j(a),m(a),d(a),g(a)},k.delay)},d=function(a){return a.addClass(k.effect+" "+k.animationClass+" ")},m=function(a){return"hidden"===a.css("visibility")&&a.css("visibility","visible"),a.is(":hidden")?a.show():void 0},i=function(a){return a.removeClass(k.effect+" "+k.animationClass)},j=function(a){return a.css({"-webkit-animation-duration":k.duration+"ms","-moz-animation-duration":k.duration+"ms","-o-animation-duration":k.duration+"ms","animation-duration":k.duration+"ms"})},f=function(a){return k.infinite===!1&&i(a),"function"==typeof k.callback?k.callback.call(a):void 0},g=function(a){return a.one(l,function(b){return b.stopPropagation(),f(a)})},this.each(function(){return h(a(this))})}})}).call(this); \ No newline at end of file diff --git a/src/animatecss.coffee b/src/animatecss.coffee index ac99a64..dd0aa93 100644 --- a/src/animatecss.coffee +++ b/src/animatecss.coffee @@ -74,7 +74,8 @@ $.fn.extend # Event triggered when the animation has finished complete = ( element ) -> - element.one transitionEnd, -> + element.one transitionEnd, (event) -> + event.stopPropagation() callback( element ) # Maintain chainability