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
This commit is contained in:
Corey Frang
2011-09-19 16:08:00 -04:00
committed by timmywil
parent af1dc64bee
commit e4c48a34b4
2 changed files with 42 additions and 3 deletions

10
src/effects.js vendored
View File

@@ -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 );
}