Skip to content
Permalink
Browse files

Merge pull request #535 from gnarf37/queue-true

Effects - Allow queue: true - Fixes #10445
  • Loading branch information...
jaubourg committed Oct 7, 2011
2 parents e828d18 + 1ba0f9c commit c51a9706046de19d051b57771f67e5bf2bcd937f
Showing with 23 additions and 4 deletions.
  1. +2 −2 src/effects.js
  2. +21 −2 test/unit/effects.js
@@ -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";
}

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

0 comments on commit c51a970

Please sign in to comment.
You can’t perform that action at this time.