X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fdata.js;h=c18e73cfd7aacc6febc3deed2f233644bca55e26;hb=c4f144eeffd94c745839b0ced2de9c62cfa9f075;hp=9cc76c603ef5402cae63f42a64fbd3c1758e9cf7;hpb=190812c3be99bde536d373b6b6ab65cfe053a532;p=jquery.git

diff --git a/src/data.js b/src/data.js
index 9cc76c6..c18e73c 100644
--- a/src/data.js
+++ b/src/data.js
@@ -1,31 +1,38 @@
 var expando = "jQuery" + now(), uuid = 0, windowData = {};
+var emptyObject = {};
 
 jQuery.extend({
 	cache: {},
+	
+	expando:expando,
 
 	data: function( elem, name, data ) {
 		elem = elem == window ?
 			windowData :
 			elem;
 
-		var id = elem[ expando ], cache = jQuery.cache;
+		var id = elem[ expando ], cache = jQuery.cache, thisCache;
 
 		// Compute a unique ID for the element
 		if(!id) id = elem[ expando ] = ++uuid;
 
-		// Only generate the data cache if we're
-		// trying to access or manipulate it
-		if ( name && !cache[ id ] )
-			cache[ id ] = {};
-
-		var thisCache = cache[ id ];
-
+		// Handle the case where there's no name immediately
+		if ( !name ) { return id; }
+
+		// Avoid generating a new cache unless none exists and we
+		// want to manipulate it.
+		if( cache[ id ] )
+			thisCache = cache[ id ];
+		else if( typeof data === "undefined" )
+			thisCache = emptyObject;
+		else
+			thisCache = cache[ id ] = {};
+		
 		// Prevent overriding the named cache with undefined values
 		if ( data !== undefined ) thisCache[ name ] = data;
 
-		if(name === true) return thisCache
-		else if(name) return thisCache[name]
-		else return id
+		if(name === true) return thisCache;
+		else return thisCache[name];
 	},
 
 	removeData: function( elem, name ) {
@@ -63,30 +70,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 +143,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){