library-mirrors/jquery
1
0
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2024-11-23 02:54:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Effects - Allow queue: true - Fixes #10445

Browse Source
This commit is contained in:
Corey Frang 2011-10-07 10:16:38 -05:00
parent cec0d0d421
commit 1ba0f9c3ed
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/effects.js vendored
View File

@ -352,8 +352,8 @@ jQuery.extend({
opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration :
opt.duration in jQuery.fx.speeds ? jQuery.fx.speeds[ opt.duration ] : jQuery.fx.speeds._default;
// if undefined, set to fx
if ( opt.queue == null ) {
// normalize opt.queue - true/undefined/null -> "fx"
if ( opt.queue == null || opt.queue === true ) {
opt.queue = "fx";
}

23
test/unit/effects.js vendored
View File

@ -390,6 +390,25 @@ asyncTest( "animate option { queue: false }", function() {
equals( foo.queue().length, 0, "Queue is empty" );
});
asyncTest( "animate option { queue: true }", function() {
expect( 2 );
var foo = jQuery( "#foo" );
foo.animate({
fontSize: "2em"
}, {
queue: true,
duration: 10,
complete: function() {
ok( true, "Animation Completed" );
start();
}
});
notEqual( foo.queue().length, 0, "Default queue is not empty" );
});
asyncTest( "animate option { queue: 'name' }", function() {
expect( 5 );
var foo = jQuery( "#foo" ),
@ -652,7 +671,7 @@ asyncTest( "stop( ..., ..., queue ) - Stop single queues", function() {
duration: 1000,
complete: function() {
equals( foo.width(), 400, "Animation completed for standard queue" );
equals( foo.height(), saved, "Height was not changed after the second stop")
equals( foo.height(), saved, "Height was not changed after the second stop");
start();
}
});
@ -673,7 +692,7 @@ asyncTest( "stop( ..., ..., queue ) - Stop single queues", function() {
queue: "height"
}).dequeue( "height" ).stop( false, false, "height" );
saved = foo.height();
})
});
test("toggle()", function() {
expect(6);