X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fdata.js;h=66d24c42ae9c5d8fd432a590e4163263b3944a23;hb=cb811c04b035eb2d652b0831e20ea1d3a4d9c448;hp=f2cfc81ce210f7e55b57817422c009f122324ca7;hpb=20673d7e5836dda504b66730b528a8dae9787493;p=jquery.git

diff --git a/src/data.js b/src/data.js
index f2cfc81..66d24c4 100644
--- a/src/data.js
+++ b/src/data.js
@@ -1,7 +1,7 @@
 (function( jQuery ) {
 
 var windowData = {},
-	rnum = /^-?[0-9.]$/;
+	rbrace = /^(?:\{.*\}|\[.*\])$/;
 
 jQuery.extend({
 	cache: {},
@@ -16,12 +16,13 @@ jQuery.extend({
 	// attempt to add expando properties to them.
 	noData: {
 		"embed": true,
-		"object": true,
+		// Ban all objects except for Flash (which handle expandos)
+		"object": "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",
 		"applet": true
 	},
 
 	data: function( elem, name, data ) {
-		if ( elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()] ) {
+		if ( !jQuery.acceptData( elem ) ) {
 			return;
 		}
 
@@ -29,18 +30,17 @@ jQuery.extend({
 			windowData :
 			elem;
 
-		var id = elem[ jQuery.expando ], cache = jQuery.cache, thisCache,
-			isNode = elem.nodeType,
-			store;
+		var isNode = elem.nodeType,
+			id = isNode ? elem[ jQuery.expando ] : null,
+			cache = jQuery.cache, thisCache;
 
-		if ( !id && typeof name === "string" && data === undefined ) {
+		if ( isNode && !id && typeof name === "string" && data === undefined ) {
 			return;
 		}
 
 		// Get the data from the object directly
 		if ( !isNode ) {
 			cache = elem;
-			id = jQuery.expando;
 
 		// Compute a unique ID for the element
 		} else if ( !id ) {
@@ -51,27 +51,17 @@ jQuery.extend({
 		// want to manipulate it.
 		if ( typeof name === "object" ) {
 			if ( isNode ) {
-				cache[ id ] = jQuery.extend(true, {}, name);
-			} else {
-				store = jQuery.extend(true, {}, name);
-				cache[ id ] = function() {
-					return store;
-				};
-			}
+				cache[ id ] = jQuery.extend(cache[ id ], name);
 
-		} else if ( !cache[ id ] ) {
-			if ( isNode ) {
-				cache[ id ] = {};
 			} else {
-				store = {};
-				cache[ id ] = function() {
-					return store;
-				};
+				jQuery.extend( cache, name );
 			}
-			
+
+		} else if ( isNode && !cache[ id ] ) {
+			cache[ id ] = {};
 		}
 
-		thisCache = isNode ? cache[ id ] : cache[ id ]();
+		thisCache = isNode ? cache[ id ] : cache;
 
 		// Prevent overriding the named cache with undefined values
 		if ( data !== undefined ) {
@@ -82,7 +72,7 @@ jQuery.extend({
 	},
 
 	removeData: function( elem, name ) {
-		if ( elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()] ) {
+		if ( !jQuery.acceptData( elem ) ) {
 			return;
 		}
 
@@ -91,11 +81,9 @@ jQuery.extend({
 			elem;
 
 		var isNode = elem.nodeType,
-			id = elem[ jQuery.expando ], cache = jQuery.cache;
-		if ( id && !isNode ) {
-			id = id();
-		}
-		var thisCache = cache[ id ];
+			id = isNode ? elem[ jQuery.expando ] : elem,
+			cache = jQuery.cache,
+			thisCache = isNode ? cache[ id ] : id;
 
 		// If we want to remove a specific section of the element's data
 		if ( name ) {
@@ -104,32 +92,50 @@ jQuery.extend({
 				delete thisCache[ name ];
 
 				// If we've removed all the data, remove the element's cache
-				if ( jQuery.isEmptyObject(thisCache) ) {
+				if ( isNode && jQuery.isEmptyObject(thisCache) ) {
 					jQuery.removeData( elem );
 				}
 			}
 
 		// Otherwise, we want to remove all of the element's data
 		} else {
-			if ( jQuery.support.deleteExpando || !isNode ) {
+			if ( isNode && jQuery.support.deleteExpando ) {
 				delete elem[ jQuery.expando ];
 
 			} else if ( elem.removeAttribute ) {
 				elem.removeAttribute( jQuery.expando );
-			}
 
 			// Completely remove the data cache
-			if ( isNode ) {
+			} else if ( isNode ) {
 				delete cache[ id ];
+
+			// Remove all fields from the object
+			} else {
+				for ( var n in elem ) {
+					delete elem[ n ];
+				}
+			}
+		}
+	},
+
+	// A method for determining if a DOM node can handle the data expando
+	acceptData: function( elem ) {
+		if ( elem.nodeName ) {
+			match = jQuery.noData[ elem.nodeName.toLowerCase() ];
+
+			if ( match ) {
+				return !(match === true || elem.getAttribute("classid") !== match);
 			}
 		}
+
+		return true;
 	}
 });
 
 jQuery.fn.extend({
 	data: function( key, value ) {
-		if ( typeof key === "undefined" && this.length ) {
-			return jQuery.data( this[0] );
+		if ( typeof key === "undefined" ) {
+			return this.length ? jQuery.data( this[0] ) : null;
 
 		} else if ( typeof key === "object" ) {
 			return this.each(function() {
@@ -152,12 +158,18 @@ jQuery.fn.extend({
 				if ( data === undefined && this[0].nodeType === 1 ) {
 					data = this[0].getAttribute( "data-" + key );
 
-					if ( data != null ) {
-						data = data === "true" ? true :
-							data === "false" ? false :
-							data === "null" ? null :
-							rnum.test( data ) ? parseFloat( data ) :
-							data;
+					if ( typeof data === "string" ) {
+						try {
+							data = data === "true" ? true :
+								data === "false" ? false :
+								data === "null" ? null :
+								!jQuery.isNaN( data ) ? parseFloat( data ) :
+								rbrace.test( data ) ? jQuery.parseJSON( data ) :
+								data;
+						} catch( e ) {}
+
+					} else {
+						data = undefined;
 					}
 				}
 			}