X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fdata.js;h=1d993fe5827cac1c79a004815b7925bc1426c342;hb=ebad701751689b773afe29d1e3c4532c7810d02a;hp=8fa62dc1eb2cccf1884291f61e92d67a269c1f43;hpb=ef819c91b999523ed6cd0c7029e0cee8997ef01a;p=jquery.git diff --git a/src/data.js b/src/data.js index 8fa62dc..1d993fe 100644 --- a/src/data.js +++ b/src/data.js @@ -77,40 +77,6 @@ jQuery.extend({ // Completely remove the data cache delete cache[ id ]; } - }, - - queue: function( elem, type, data ) { - if( !elem ) return; - - type = (type || "fx") + "queue"; - 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 - q.push( data ); - - return q; - }, - - dequeue: function( elem, type ){ - type = type || "fx"; - - var queue = jQuery.queue( elem, type ), fn = queue.shift(); - - // 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); }); - } } }); @@ -126,45 +92,22 @@ jQuery.fn.extend({ if ( value === undefined ) { var data = this.triggerHandler("getData" + parts[1] + "!", [parts[0]]); - if ( data === undefined && this.length ) + if ( data === undefined && this.length ) { data = jQuery.data( this[0], key ); - + } return data === undefined && parts[1] ? this.data( parts[0] ) : data; - } else + } else { return this.trigger("setData" + parts[1] + "!", [parts[0], value]).each(function(){ jQuery.data( this, key, value ); }); + } }, removeData: function( key ){ return this.each(function(){ jQuery.removeData( this, key ); }); - }, - queue: function(type, data){ - if ( typeof type !== "string" ) { - data = type; - type = "fx"; - } - - if ( data === undefined ) - return jQuery.queue( this[0], type ); - - return this.each(function(i, elem){ - var queue = jQuery.queue( this, type, data ); - - if( type == "fx" && queue[0] !== "inprogress" ) - jQuery.dequeue( this, type ) - }); - }, - dequeue: function(type){ - return this.each(function(){ - jQuery.dequeue( this, type ); - }); - }, - clearQueue: function(type){ - return this.queue( type || "fx", [] ); } });