aboutsummaryrefslogtreecommitdiffstats
path: root/ui/jquery.effects.core.js
diff options
context:
space:
mode:
authorCorey Frang <gnarf@gnarf.net>2012-04-30 00:19:52 -0500
committerCorey Frang <gnarf@gnarf.net>2012-04-30 00:19:52 -0500
commitfe55b6cddb00b85a56f9eb8f753b0535690d8b95 (patch)
tree29b95c5e21774c109c862d04b6c355b61d140b7d /ui/jquery.effects.core.js
parent1da2bf0daf68659c575c44e58807bc06e08e01be (diff)
downloadjquery-ui-fe55b6cddb00b85a56f9eb8f753b0535690d8b95.tar.gz
jquery-ui-fe55b6cddb00b85a56f9eb8f753b0535690d8b95.zip
Effects: Updating unit tests to use some more stable logic hopefully
Diffstat (limited to 'ui/jquery.effects.core.js')
-rw-r--r--ui/jquery.effects.core.js19
1 files changed, 9 insertions, 10 deletions
diff --git a/ui/jquery.effects.core.js b/ui/jquery.effects.core.js
index bac060067..edf9aa400 100644
--- a/ui/jquery.effects.core.js
+++ b/ui/jquery.effects.core.js
@@ -268,16 +268,15 @@ $.effects.animateClass = function( value, duration, easing, callback ) {
// map all animated objects again - this time collecting a promise
allAnimations = allAnimations.map(function() {
var styleInfo = this,
- dfd = $.Deferred();
-
- this.el.animate( this.diff, {
- duration: o.duration,
- easing: o.easing,
- queue: false,
- complete: function() {
- dfd.resolve( styleInfo );
- }
- });
+ dfd = $.Deferred(),
+ opts = jQuery.extend({}, o, {
+ queue: false,
+ complete: function() {
+ dfd.resolve( styleInfo )
+ }
+ });
+
+ this.el.animate( this.diff, opts );
return dfd.promise();
});