deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed #1822 bug where queue() didn't always default to type 'fx'.

Browse source
This commit is contained in:
David Serduke 2007-11-16 18:23:59 +00:00
parent 1d299d375b
commit 0a0990485e
2 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/fx.js
View file

@ -126,7 +126,7 @@ jQuery.fn.extend({
}, },
queue: function(type, fn){ queue: function(type, fn){
if ( jQuery.isFunction(type) ) { if ( jQuery.isFunction(type) || ( type && type.constructor == Array )) {
fn = type; fn = type;
type = "fx"; type = "fx";
} }
@ -162,6 +162,8 @@ var queue = function( elem, type, array ) {
if ( !elem ) if ( !elem )
return; return;
type = type || "fx";
var q = jQuery.data( elem, type + "queue" ); var q = jQuery.data( elem, type + "queue" );
if ( !q || array ) if ( !q || array )

19
test/unit/fx.js
View file

@ -29,11 +29,28 @@ test("animate option (queue === false)", function () {
$foo.animate({height:'100px'}, 10, function() { $foo.animate({height:'100px'}, 10, function() {
// queued behind the first animation so should finish third // queued behind the first animation so should finish third
order.push(3); order.push(3);
isSet( order, [ 1, 2, 3] ); isSet( order, [ 1, 2, 3], "Animations finished in the correct order" );
start(); start();
}); });
}); });
test("queue() defaults to 'fx' type", function () {
expect(2);
stop();
var $foo = $("#foo");
$foo.queue("fx", [ "sample", "array" ]);
var arr = $foo.queue();
isSet(arr, [ "sample", "array" ], "queue() got an array set with type 'fx'");
$foo.queue([ "another", "one" ]);
var arr = $foo.queue("fx");
isSet(arr, [ "another", "one" ], "queue('fx') got an array set with no type");
// clean up after test
$foo.queue([]);
start();
});
test("stop()", function() { test("stop()", function() {
expect(3); expect(3);
stop(); stop();