X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fdata.js;h=03116e4b10ed9223b4becec72b407bce03995ddd;hb=991d039b62f5dfcb9e3d99fe28212a6874e8f5c7;hp=1d5fe8954bf2899b7a653b0be926519f3a189ba9;hpb=d36d224cc52e70d837306d33a03f517ef72abc60;p=jquery.git

diff --git a/src/data.js b/src/data.js
index 1d5fe89..03116e4 100644
--- a/src/data.js
+++ b/src/data.js
@@ -8,27 +8,24 @@ jQuery.extend({
 			windowData :
 			elem;
 
-		var id = elem[ expando ];
+		var id = elem[ expando ], cache = jQuery.cache;
 
 		// Compute a unique ID for the element
-		if ( !id )
-			id = elem[ expando ] = ++uuid;
+		if(!id) id = elem[ expando ] = ++uuid;
 
 		// Only generate the data cache if we're
 		// trying to access or manipulate it
-		if ( name && !jQuery.cache[ id ] )
-			jQuery.cache[ id ] = {};
+		if ( name && !cache[ id ] )
+			cache[ id ] = {};
 
-		// Prevent overriding the named cache with undefined values
-		if ( data !== undefined )
-			jQuery.cache[ id ][ name ] = data;
+		var thisCache = cache[ id ];
 
-		if(name === true) return jQuery.cache[ id ]
+		// Prevent overriding the named cache with undefined values
+		if ( data !== undefined ) thisCache[ name ] = data;
 
-		// Return the named cache data, or the ID for the element
-		return name ?
-			jQuery.cache[ id ][ name ] :
-			id;
+		if(name === true) return thisCache
+		else if(name) return thisCache[name]
+		else return id
 	},
 
 	removeData: function( elem, name ) {
@@ -36,21 +33,16 @@ jQuery.extend({
 			windowData :
 			elem;
 
-		var id = elem[ expando ];
+		var id = elem[ expando ], cache = jQuery.cache, thisCache = cache[ id ];
 
 		// If we want to remove a specific section of the element's data
 		if ( name ) {
-			if ( jQuery.cache[ id ] ) {
+			if ( thisCache ) {
 				// Remove the section of cache data
-				delete jQuery.cache[ id ][ name ];
+				delete thisCache[ name ];
 
 				// If we've removed all the data, remove the element's cache
-				name = "";
-
-				for ( name in jQuery.cache[ id ] )
-					break;
-
-				if ( !name )
+				if( jQuery.isEmptyObject(thisCache) )
 					jQuery.removeData( elem );
 			}
 
@@ -67,34 +59,41 @@ jQuery.extend({
 			}
 
 			// Completely remove the data cache
-			delete jQuery.cache[ id ];
+			delete cache[ id ];
 		}
 	},
 	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";
+
+		var queue = jQuery.queue( elem, type ), fn = queue.shift();
 
-		if( !type || type === "fx" )
-			fn = queue[0];
+		// If the fx queue is dequeued, always remove the progress sentinel
+		if( fn === "inprogress" ) fn = queue.shift();
 
-		if( fn !== undefined )
-			fn.call(elem, function() { jQuery(elem).dequeue(type); });
+		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); });
+		}
 	}
 });
 
@@ -137,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){