Skip to content

Fixes #12278 - Promises on non-default queue wait until a dequeue is attempted on an empty queue #893

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fixes #12278 - Promises on non-default queue wait until a dequeue is attempted on an empty queue #893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/queue.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand All @@ -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 ) {
Expand All @@ -45,7 +47,8 @@ jQuery.extend({
delete hooks.stop;
fn.call( elem, next, hooks );
}
if ( !queue.length && hooks ) {

if ( !startLength && hooks ) {
hooks.empty.fire();
}
},
Expand Down Expand Up @@ -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 );
}
Expand Down
31 changes: 29 additions & 2 deletions test/unit/queue.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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();
Expand Down Expand Up @@ -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() {
Expand Down Expand Up @@ -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() {
Expand All @@ -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() {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Almost perfect ;)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Am I being blind? What'd I miss?

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

Expand Down