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

clearQueue and next should now work with default fx on all browsers

Browse source
This commit is contained in:
Yehuda Katz 2009-07-13 22:21:40 +00:00
parent 7cfec99858
commit 89dc1e0143
2 changed files with 11 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/data.js
View file

@ -130,11 +130,11 @@ jQuery.fn.extend({
if ( data === undefined ) if ( data === undefined )
return jQuery.queue( this[0], type ); return jQuery.queue( this[0], type );
return this.each(function(){ return this.each(function(i, elem){
var queue = jQuery.queue( this, type, data ); var queue = jQuery.queue( this, type, data );
if( type == "fx" && queue.length == 1 ) if( type == "fx" && queue.length == 1 )
queue[0].call(this); queue[0].call(this, function() { jQuery(elem).dequeue(type); });
}); });
}, },
dequeue: function(type){ dequeue: function(type){
@ -143,6 +143,6 @@ jQuery.fn.extend({
}); });
}, },
clearQueue: function(type){ clearQueue: function(type){
return this.queue( type, [] ); return this.queue( type || "fx", [] );
} }
}); });

31
test/unit/data.js
View file

@ -180,22 +180,6 @@ test("queue(name) passes in the next item in the queue as a parameter", function
div.removeData(); div.removeData();
}); });
expect(1);
var div = jQuery({});
var counter = 0;
div.queue("foo", function(next) {
counter++;
jQuery(this).clearQueue("foo");
next();
}).queue("foo", function(next) {
counter++;
});
div.dequeue("foo");
equals(counter, 1, "the queue was cleared");
test("queue(name) passes in the next item in the queue as a parameter", function() { test("queue(name) passes in the next item in the queue as a parameter", function() {
expect(2); expect(2);
@ -229,12 +213,10 @@ test("queue() passes in the next item in the queue as a parameter to fx queues",
}).queue(function(next) { }).queue(function(next) {
equals(++counter, 2, "Next was called"); equals(++counter, 2, "Next was called");
next(); next();
}).queue(function() { }).queue("bar", function() {
equals(++counter, 3, "Other queues are not triggered by next()") equals(++counter, 3, "Other queues are not triggered by next()")
}); });
div.dequeue();
div.removeData(); div.removeData();
}); });
@ -255,6 +237,8 @@ test("clearQueue(name) clears the queue", function() {
div.dequeue("foo"); div.dequeue("foo");
equals(counter, 1, "the queue was cleared"); equals(counter, 1, "the queue was cleared");
div.removeData();
}); });
test("clearQueue() clears the fx queue", function() { test("clearQueue() clears the fx queue", function() {
@ -265,13 +249,12 @@ test("clearQueue() clears the fx queue", function() {
div.queue(function(next) { div.queue(function(next) {
counter++; counter++;
jQuery(this).clearQueue(); setTimeout(function() { jQuery(this).clearQueue(); next(); }, 50);
next();
}).queue(function(next) { }).queue(function(next) {
counter++; counter++;
}); });
div.dequeue();
equals(counter, 1, "the queue was cleared"); equals(counter, 1, "the queue was cleared");
})
div.removeData();
});