diff options
| author | Corey Frang <gnarf@gnarf.net> | 2011-09-19 16:08:00 -0400 |
|---|---|---|
| committer | timmywil <timmywillisn@gmail.com> | 2011-09-19 16:08:00 -0400 |
| commit | e4c48a34b4fe687d4a3b935b6c405f502dd0223e (patch) | |
| tree | 9536f442611b7e16a087e5f92cc0f0619b701e13 /src | |
| parent | af1dc64bee90960f7898699c3788133177aff3bc (diff) | |
| download | jquery-e4c48a34b4fe687d4a3b935b6c405f502dd0223e.tar.gz jquery-e4c48a34b4fe687d4a3b935b6c405f502dd0223e.zip | |
Landing pull request 496. 1.7 animate: allow named queues to be used by animate. Fixes #9280.
More Details:
- https://github.com/jquery/jquery/pull/496
- http://bugs.jquery.com/ticket/9280
Diffstat (limited to 'src')
| -rw-r--r-- | src/effects.js | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/effects.js b/src/effects.js index 7e46a5c3f..3edb96fae 100644 --- a/src/effects.js +++ b/src/effects.js @@ -126,7 +126,7 @@ jQuery.fn.extend({ // Do not change referenced properties as per-property easing will be lost prop = jQuery.extend( {}, prop ); - return this[ optall.queue === false ? "each" : "queue" ](function() { + function doAnimation() { // XXX 'this' does not always have a nodeName when running the // test suite @@ -240,7 +240,11 @@ jQuery.fn.extend({ // For JS strict compliance return true; - }); + } + + return optall.queue === false ? + this.each( doAnimation ) : + this.queue( optall.queue || "fx", doAnimation ); }, stop: function( clearQueue, gotoEnd ) { @@ -335,7 +339,7 @@ jQuery.extend({ } if ( opt.queue !== false ) { - jQuery.dequeue( this ); + jQuery.dequeue( this, opt.queue || "fx" ); } else if ( noUnmark !== false ) { jQuery._unmark( this ); } |