diff options
author | jeresig <jeresig@gmail.com> | 2009-12-21 11:11:03 -0500 |
---|---|---|
committer | jeresig <jeresig@gmail.com> | 2009-12-21 11:11:03 -0500 |
commit | 0d5bd174614fa278826ac4aaaa64342f17c0ae56 (patch) | |
tree | efc8cba12b0cd8d6158c1a4120e5e0344cdd460c /src/effects.js | |
parent | f0505c6d75722d5617dedfd5f6165285c18103c8 (diff) | |
download | jquery-0d5bd174614fa278826ac4aaaa64342f17c0ae56.tar.gz jquery-0d5bd174614fa278826ac4aaaa64342f17c0ae56.zip |
Moved logic for handling .animate({}), doesn't queue anymore. Fixes #5459.
Diffstat (limited to 'src/effects.js')
-rw-r--r-- | src/effects.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/effects.js b/src/effects.js index c562d0335..5d656c96c 100644 --- a/src/effects.js +++ b/src/effects.js @@ -108,6 +108,10 @@ jQuery.fn.extend({ animate: function( prop, speed, easing, callback ) { var optall = jQuery.speed(speed, easing, callback); + if ( jQuery.isEmptyObject( prop ) ) { + return this.each( optall.complete ); + } + return this[ optall.queue === false ? "each" : "queue" ](function() { var opt = jQuery.extend({}, optall), p, hidden = this.nodeType === 1 && jQuery(this).is(":hidden"), @@ -181,10 +185,6 @@ jQuery.fn.extend({ } }); - if ( jQuery.isEmptyObject( prop ) ) { - return optall.complete.call(this); - } - // For JS strict compliance return true; }); |