X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fdata.js;h=b9986f58db0fb06fc081e68f267bbdd1abe2ab41;hb=a6f3757d50f8be021505f4f7fa7201199e8b7f2d;hp=1d993fe5827cac1c79a004815b7925bc1426c342;hpb=ebad701751689b773afe29d1e3c4532c7810d02a;p=jquery.git

diff --git a/src/data.js b/src/data.js
index 1d993fe..b9986f5 100644
--- a/src/data.js
+++ b/src/data.js
@@ -1,20 +1,30 @@
 var expando = "jQuery" + now(), uuid = 0, windowData = {};
-var emptyObject = {};
 
 jQuery.extend({
 	cache: {},
 	
 	expando:expando,
 
+	// The following elements throw uncatchable exceptions if you
+	// attempt to add expando properties to them.
+	noData: {
+		"embed": true,
+		"object": true,
+		"applet": true
+	},
+
 	data: function( elem, name, data ) {
+		if ( elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()] ) {
+			return;
+		}
+
 		elem = elem == window ?
 			windowData :
 			elem;
 
 		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;
 		}
 
@@ -25,24 +35,30 @@ jQuery.extend({
 
 		// 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 ] = {};
+		if ( typeof name === "object" ) {
+			elem[ expando ] = id;
+			thisCache = cache[ id ] = jQuery.extend(true, {}, name);
+
+		} 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;
 		}
-		
-		return name ? thisCache[ name ] : thisCache;
+
+		return typeof name === "string" ? thisCache[ name ] : thisCache;
 	},
 
 	removeData: function( elem, name ) {
+		if ( elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()] ) {
+			return;
+		}
+
 		elem = elem == window ?
 			windowData :
 			elem;
@@ -63,15 +79,11 @@ jQuery.extend({
 
 		// Otherwise, we want to remove all of the element's data
 		} else {
-			// Clean up the element expando
-			try {
-				delete elem[ expando ];
-			} catch( e ) {
-				// IE has trouble directly removing the expando
-				// but it's ok with using removeAttribute
-				if ( elem.removeAttribute ) {
-					elem.removeAttribute( expando );
-				}
+			if ( jQuery.support.deleteExpando ) {
+				delete elem[ jQuery.expando ];
+
+			} else if ( elem.removeAttribute ) {
+				elem.removeAttribute( jQuery.expando );
 			}
 
 			// Completely remove the data cache
@@ -81,9 +93,14 @@ jQuery.extend({
 });
 
 jQuery.fn.extend({
-	data: function( key, value ){
+	data: function( key, value ) {
 		if ( typeof key === "undefined" && this.length ) {
 			return jQuery.data( this[0] );
+
+		} else if ( typeof key === "object" ) {
+			return this.each(function() {
+				jQuery.data( this, key );
+			});
 		}
 
 		var parts = key.split(".");
@@ -99,14 +116,14 @@ 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 );
 		});
 	}