X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fdata.js;h=20c134a6d85a7186e350c74b12e4f26aa2c87a25;hb=b8076a914ba9d400dc9c48d866b145df6fabafcf;hp=69adc1239b107611031666633ec5624a860b61a5;hpb=f6a0bf6816f4e2e67382b1b13fdd3ff2ea4b22f8;p=jquery.git

diff --git a/src/data.js b/src/data.js
index 69adc12..20c134a 100644
--- a/src/data.js
+++ b/src/data.js
@@ -1,5 +1,4 @@
 var expando = "jQuery" + now(), uuid = 0, windowData = {};
-var emptyObject = {};
 
 jQuery.extend({
 	cache: {},
@@ -25,8 +24,7 @@ jQuery.extend({
 
 		var id = elem[ expando ], cache = jQuery.cache, thisCache;
 
-		// Handle the case where there's no name immediately
-		if ( !name && !id ) {
+		if ( !id && typeof name === "string" && data === undefined ) {
 			return null;
 		}
 
@@ -40,17 +38,16 @@ jQuery.extend({
 		if ( typeof name === "object" ) {
 			elem[ expando ] = id;
 			thisCache = cache[ id ] = jQuery.extend(true, {}, name);
-		} else if ( cache[ id ] ) {
-			thisCache = cache[ id ];
-		} else if ( typeof data === "undefined" ) {
-			thisCache = emptyObject;
-		} else {
-			thisCache = cache[ id ] = {};
+
+		} else if ( !cache[ id ] ) {
+			elem[ expando ] = id;
+			cache[ id ] = {};
 		}
 
+		thisCache = cache[ id ];
+
 		// Prevent overriding the named cache with undefined values
 		if ( data !== undefined ) {
-			elem[ expando ] = id;
 			thisCache[ name ] = data;
 		}
 
@@ -100,7 +97,7 @@ jQuery.extend({
 });
 
 jQuery.fn.extend({
-	data: function( key, value ){
+	data: function( key, value ) {
 		if ( typeof key === "undefined" && this.length ) {
 			return jQuery.data( this[0] );
 
@@ -123,15 +120,34 @@ jQuery.fn.extend({
 				this.data( parts[0] ) :
 				data;
 		} else {
-			return this.trigger("setData" + parts[1] + "!", [parts[0], value]).each(function(){
+			return this.trigger("setData" + parts[1] + "!", [parts[0], value]).each(function() {
 				jQuery.data( this, key, value );
 			});
 		}
 	},
 
-	removeData: function( key ){
-		return this.each(function(){
+	removeData: function( key ) {
+		return this.each(function() {
 			jQuery.removeData( this, key );
 		});
 	}
 });
+
+var removeExpando = function( elem ) {
+	delete elem[ expando ];
+};
+
+try {
+	var div = document.createElement("div");
+	div[ expando ] = true;
+	delete div[ expando ];
+	
+} catch( e ) {
+	// IE has trouble directly removing the expando
+	// but it's ok with using removeAttribute
+	removeExpando = function( elem ) {
+		if ( elem.removeAttribute ) {
+			elem.removeAttribute( expando );
+		}
+	};
+}
\ No newline at end of file