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

Refactor queueing system to allow auto-dequeuing to use dequeue directly and

Browse source 
therefore require dequeue to always leave the element it has dequeued on
the queue.

  - In the fx queue, a progress sentinel is added when a queue element
    is dequeued.
  - The sentinel is ignored when dequeue is called explicitly
  - When adding a new element to the fx queue, queue() checks if
    the progress sentinel is present. If not, it calls dequeue()
This commit is contained in:
Yehuda Katz 2009-07-16 07:32:39 +00:00
parent 190812c3be
commit 991d039b62
2 changed files with 44 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/data.js
View file

@ -63,30 +63,37 @@ jQuery.extend({
}
},
queue: function( elem, type, data ) {
if ( elem ){
if( !elem ) return;
type = (type || "fx") + "queue";
type = (type || "fx") + "queue";
var q = jQuery.data( elem, type );
var q = jQuery.data( elem, type );
// Speed up dequeue by getting out quickly if this is just a lookup
if( !data ) return q || [];
if ( !q || jQuery.isArray(data) )
q = jQuery.data( elem, type, jQuery.makeArray(data) );
else if( data )
q.push( data );
if ( !q || jQuery.isArray(data) )
q = jQuery.data( elem, type, jQuery.makeArray(data) );
else
q.push( data );
}
return q;
},
dequeue: function( elem, type ){
var queue = jQuery.queue( elem, type ),
fn = queue.shift();
type = type || "fx";
if( !type || type === "fx" )
fn = queue[0];
var queue = jQuery.queue( elem, type ), fn = queue.shift();
if( fn !== undefined )
fn.call(elem, function() { jQuery(elem).dequeue(type); });
// If the fx queue is dequeued, always remove the progress sentinel
if( fn === "inprogress" ) fn = queue.shift();
if( fn ) {
// Add a progress sentinel to prevent the fx queue from being
// automatically dequeued
if( type == "fx" ) queue.unshift("inprogress");
fn.call(elem, function() { jQuery.dequeue(elem, type); });
}
}
});
@ -129,8 +136,8 @@ jQuery.fn.extend({
return this.each(function(i, elem){
var queue = jQuery.queue( this, type, data );
if( type == "fx" && queue.length == 1 )
queue[0].call(this, function() { jQuery(elem).dequeue(type); });
if( type == "fx" && queue[0] !== "inprogress" )
jQuery.dequeue( this, type )
});
},
dequeue: function(type){