Skip to content

Commit 977db53

Browse files
authored
Merge pull request craigmdennis#22 from martingg88/master
Prevent event from bubbling up Fix craigmdennis#24
2 parents b343985 + ec97f49 commit 977db53

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

dist/jquery.animatecss.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! animateCSS - v1.2.1 - 2015-03-23
1+
/*! animateCSS - v1.2.1 - 2015-10-18
22
* https://github.com/craigmdennis/animateCSS
33
* Copyright (c) 2015 Craig Dennis; Licensed MIT */
44

@@ -67,7 +67,8 @@
6767
}
6868
};
6969
complete = function(element) {
70-
return element.one(transitionEnd, function() {
70+
return element.one(transitionEnd, function(event) {
71+
event.stopPropagation();
7172
return callback(element);
7273
});
7374
};

dist/jquery.animatecss.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/animatecss.coffee

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,8 @@ $.fn.extend
7474

7575
# Event triggered when the animation has finished
7676
complete = ( element ) ->
77-
element.one transitionEnd, ->
77+
element.one transitionEnd, (event) ->
78+
event.stopPropagation()
7879
callback( element )
7980

8081
# Maintain chainability

0 commit comments

Comments
 (0)