From b26188b5b84261813ca601b9d04eb5fb66610ab6 Mon Sep 17 00:00:00 2001 From: Tim Goosens Date: Fri, 31 Oct 2014 14:05:27 +0100 Subject: [PATCH 1/6] Added animation-duration option. --- dist/jquery.animatecss.js | 14 +++++++++++--- dist/jquery.animatecss.min.js | 4 ++-- src/animatecss.coffee | 9 +++++++++ 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/dist/jquery.animatecss.js b/dist/jquery.animatecss.js index 7844104..902ccee 100644 --- a/dist/jquery.animatecss.js +++ b/dist/jquery.animatecss.js @@ -1,4 +1,4 @@ -/*! animateCSS - v1.1.5 - 2014-05-27 +/*! animateCSS - v1.1.5 - 2014-10-31 * https://github.com/craigmdennis/animateCSS * Copyright (c) 2014 Craig Dennis; Licensed MIT */ @@ -10,14 +10,15 @@ $.fn.extend({ animateCSS: function(effect, options) { - var addClass, animate, callback, complete, init, removeClass, settings, transitionEnd, unhide; + var addClass, animate, callback, complete, init, removeClass, setDuration, settings, transitionEnd, unhide; settings = { effect: effect, delay: 0, animationClass: 'animated', infinite: false, callback: options, - debug: false + debug: false, + duration: 1 }; transitionEnd = 'webkitAnimationEnd mozAnimationEnd MSAnimationEnd oanimationend animationend'; settings = $.extend(settings, options); @@ -29,11 +30,18 @@ settings.animationClass += ' infinite'; } return setTimeout(function() { + setDuration(element); unhide(element); addClass(element); return complete(element); }, settings.delay); }; + setDuration = function(element) { + return element.css({ + 'webkit-animation-duration': settings.duration + 's', + 'animation-duration': settings.duration + 's' + }); + }; addClass = function(element) { return element.addClass(settings.effect + ' ' + settings.animationClass + ' '); }; diff --git a/dist/jquery.animatecss.min.js b/dist/jquery.animatecss.min.js index ee50a6c..eb334fe 100644 --- a/dist/jquery.animatecss.min.js +++ b/dist/jquery.animatecss.min.js @@ -1,5 +1,5 @@ -/*! animateCSS - v1.1.5 - 2014-05-27 +/*! animateCSS - v1.1.5 - 2014-10-31 * https://github.com/craigmdennis/animateCSS * Copyright (c) 2014 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;return j={effect:b,delay:0,animationClass:"animated",infinite:!1,callback:c,debug:!1},k="webkitAnimationEnd mozAnimationEnd MSAnimationEnd oanimationend animationend",j=a.extend(j,c),h=function(a){return e(a)},e=function(a){return j.infinite===!0&&(j.animationClass+=" infinite"),setTimeout(function(){return l(a),d(a),g(a)},j.delay)},d=function(a){return a.addClass(j.effect+" "+j.animationClass+" ")},l=function(a){return"hidden"===a.css("visibility")&&a.css("visibility","visible"),a.is(":hidden")?a.show():void 0},i=function(a){return a.removeClass(j.effect+" "+j.animationClass)},f=function(a){return j.infinite===!1&&i(a),"function"==typeof j.callback?j.callback.call(a):void 0},g=function(a){return a.one(k,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,debug:!1,duration: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)},j=function(a){return a.css({"webkit-animation-duration":k.duration+"s","animation-duration":k.duration+"s"})},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)},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 diff --git a/src/animatecss.coffee b/src/animatecss.coffee index 46316a6..d5d8e22 100644 --- a/src/animatecss.coffee +++ b/src/animatecss.coffee @@ -17,6 +17,7 @@ $.fn.extend infinite: false callback: options debug: false + duration: 1 # Vendor prefixed transition callbacks transitionEnd = 'webkitAnimationEnd mozAnimationEnd MSAnimationEnd oanimationend animationend' @@ -35,11 +36,19 @@ $.fn.extend # Run a timer regardless of delay (as 0 will fire instantly anyway) setTimeout -> + setDuration( element ) unhide( element ) addClass( element ) complete( element ) , settings.delay + # Add custom duration to element + setDuration = (element) -> + element.css( + 'webkit-animation-duration' : settings.duration + 's' + 'animation-duration' : settings.duration + 's' + ) + # Add the animation ad effect classes to kick everything off addClass = ( element ) -> element.addClass( settings.effect + ' ' + settings.animationClass + ' ') From 16d5771675309a6c69d69db295e67bbcde7b61d7 Mon Sep 17 00:00:00 2001 From: Tim Goosens Date: Fri, 31 Oct 2014 14:19:01 +0100 Subject: [PATCH 2/6] Update bower file --- bower.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bower.json b/bower.json index e18288a..d127911 100644 --- a/bower.json +++ b/bower.json @@ -9,7 +9,7 @@ "devDependencies": { "jquery": "~1.11.0" }, - "homepage": "https://github.com/craigmdennis/animateCSS", + "homepage": "https://github.com/goosens/animateCSS", "authors": [ "Craig Dennis " ], From 0131d6f2f86ad9e2b83a0e1e44b38e2cc8ce8932 Mon Sep 17 00:00:00 2001 From: Tim Goosens Date: Fri, 31 Oct 2014 14:21:25 +0100 Subject: [PATCH 3/6] Update bower file --- bower.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bower.json b/bower.json index d127911..c8d929c 100644 --- a/bower.json +++ b/bower.json @@ -2,7 +2,7 @@ "name": "animateCSS", "description": "A jQuery plugin to dynamically apply animate.css animations with callbacks", "main": "dist/jquery.animatecss.js", - "version": "1.1.5", + "version": "1.1.6", "dependencies": { "animate.css": "~3.1.1" }, From 1b50c23c65f5a32707868f40171f309c8e69f848 Mon Sep 17 00:00:00 2001 From: Tim Goosens Date: Fri, 31 Oct 2014 14:37:18 +0100 Subject: [PATCH 4/6] updated to v.1.1.6 --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6ff5b12..862aa40 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ + +### 1.1.6 (2014-10-31) + ### 1.1.5 (2014-05-27) From 97b022099d526619fde2391f5ff2986736823a6d Mon Sep 17 00:00:00 2001 From: Tim Goosens Date: Fri, 31 Oct 2014 14:38:23 +0100 Subject: [PATCH 5/6] updated to v.1.1.6 --- animateCSS.jquery.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/animateCSS.jquery.json b/animateCSS.jquery.json index 781ff1c..7e13d76 100644 --- a/animateCSS.jquery.json +++ b/animateCSS.jquery.json @@ -2,7 +2,7 @@ "name": "animateCSS", "title": "Animate CSS jQuery Plugin", "description": "A jQuery plugin to dynamically apply animate.css animations with callbacks", - "version": "1.1.5", + "version": "1.1.6", "homepage": "https://github.com/craigmdennis/animateCSS.git", "author": { "name": "Craig Dennis", diff --git a/package.json b/package.json index 3458ffd..e72ff94 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "animateCSS", - "version": "1.1.5", + "version": "1.1.6", "description": "Animate CSS jQuery Plugin", "keywords": [ "jquery-plugin", From f6854876d4e208a02d5c24b6752fafa3aeaa93e1 Mon Sep 17 00:00:00 2001 From: Tim Goosens Date: Fri, 31 Oct 2014 14:51:28 +0100 Subject: [PATCH 6/6] v.1.1.7 --- CHANGELOG.md | 3 +++ animateCSS.jquery.json | 6 +++--- bower.json | 2 +- package.json | 6 +++--- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 862aa40..f20c58f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ + +### 1.1.7 (2014-10-31) + ### 1.1.6 (2014-10-31) diff --git a/animateCSS.jquery.json b/animateCSS.jquery.json index 7e13d76..da7cfb8 100644 --- a/animateCSS.jquery.json +++ b/animateCSS.jquery.json @@ -2,15 +2,15 @@ "name": "animateCSS", "title": "Animate CSS jQuery Plugin", "description": "A jQuery plugin to dynamically apply animate.css animations with callbacks", - "version": "1.1.6", - "homepage": "https://github.com/craigmdennis/animateCSS.git", + "version": "1.1.7", + "homepage": "https://github.com/goosens/animateCSS.git", "author": { "name": "Craig Dennis", "url": "https://github.com/craigmdennis" }, "repository": { "type": "git", - "url": "https://github.com/craigmdennis/animateCSS.git" + "url": "https://github.com/goosens/animateCSS.git" }, "bugs": "https://github.com/craigmdennis/animateCSS/issues", "licenses": [ diff --git a/bower.json b/bower.json index c8d929c..e479fa3 100644 --- a/bower.json +++ b/bower.json @@ -2,7 +2,7 @@ "name": "animateCSS", "description": "A jQuery plugin to dynamically apply animate.css animations with callbacks", "main": "dist/jquery.animatecss.js", - "version": "1.1.6", + "version": "1.1.7", "dependencies": { "animate.css": "~3.1.1" }, diff --git a/package.json b/package.json index e72ff94..8e0bba9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "animateCSS", - "version": "1.1.6", + "version": "1.1.7", "description": "Animate CSS jQuery Plugin", "keywords": [ "jquery-plugin", @@ -8,7 +8,7 @@ "animation", "callbacks" ], - "homepage": "https://github.com/craigmdennis/animateCSS", + "homepage": "https://github.com/goosens/animateCSS", "bugs": "https://github.com/craigmdennis/animateCSS/issues", "author": { "name": "Craig Dennis", @@ -17,7 +17,7 @@ }, "repository": { "type": "git", - "url": "https://github.com/craigmdennis/animateCSS.git" + "url": "https://github.com/goosens/animateCSS.git" }, "licenses": [ {