library-mirrors/jquery
1
0
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2024-10-05 11:34:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix #12278. Promises on non-default queue wait until a dequeue is attempted on an empty queue. Close gh-893.

Browse Source
This commit is contained in:
Corey Frang 2012-08-13 12:43:49 -05:00 committed by Dave Methvin
parent 6b9fde1344
commit 3812f9436d
2 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/queue.js
View File

@ -22,6 +22,7 @@ jQuery.extend({
type = type || "fx";
var queue = jQuery.queue( elem, type ),
startLength = queue.length,
fn = queue.shift(),
hooks = jQuery._queueHooks( elem, type ),
next = function() {
@ -31,6 +32,7 @@ jQuery.extend({
// If the fx queue is dequeued, always remove the progress sentinel
if ( fn === "inprogress" ) {
fn = queue.shift();
startLength--;
}
if ( fn ) {
@ -45,7 +47,8 @@ jQuery.extend({
delete hooks.stop;
fn.call( elem, next, hooks );
}
if ( !queue.length && hooks ) {
if ( !startLength && hooks ) {
hooks.empty.fire();
}
},
@ -131,7 +134,8 @@ jQuery.fn.extend({
type = type || "fx";
while( i-- ) {
if ( (tmp = jQuery._data( elements[ i ], type + "queueHooks" )) && tmp.empty ) {
tmp = jQuery._data( elements[ i ], type + "queueHooks" );
if ( tmp && tmp.empty ) {
count++;
tmp.empty.add( resolve );
}

31
test/unit/queue.js
View File

@ -1,6 +1,6 @@
module( "queue", { teardown: moduleTeardown });
test( "queue() with other types", 12, function() {
test( "queue() with other types", 14, function() {
var counter = 0;
stop();
@ -45,6 +45,12 @@ test( "queue() with other types", 12, function() {
equal( counter, 4, "Testing previous call to dequeue" );
equal( $div.queue("foo").length, 0, "Testing queue length" );
$div.dequeue("foo");
equal( counter, 4, "Testing previous call to dequeue" );
equal( $div.queue("foo").length, 0, "Testing queue length" );
});
test("queue(name) passes in the next item in the queue as a parameter", function() {
@ -206,8 +212,8 @@ asyncTest( "fn.promise( \"queue\" ) - called whenever last queue function is deq
}).queue( "queue", function( next ) {
strictEqual( test++, 2, "step two" );
setTimeout( function() {
strictEqual( test++, 4, "step four" );
next();
strictEqual( test++, 4, "step four" );
start();
}, 10 );
}).promise( "queue" ).done( function() {
@ -217,6 +223,27 @@ asyncTest( "fn.promise( \"queue\" ) - called whenever last queue function is deq
foo.dequeue( "queue" );
});
asyncTest( "fn.promise( \"queue\" ) - waits for animation to complete before resolving", 2, function() {
var foo = jQuery( "#foo" ),
test = 1;
foo.animate({
top: 100
}, {
duration: 1,
queue: "queue",
complete: function() {
strictEqual( test++, 1, "step one" );
}
}).dequeue( "queue" );
foo.promise( "queue" ).done( function() {
strictEqual( test++, 2, "step two" );
start();
});
});
test( ".promise(obj)", function() {
expect(2);