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

diff --git a/src/data.js b/src/data.js
index 1d993fe..69adc12 100644
--- a/src/data.js
+++ b/src/data.js
@@ -6,7 +6,19 @@ jQuery.extend({
 	
 	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;
@@ -25,24 +37,31 @@ jQuery.extend({
 
 		// Avoid generating a new cache unless none exists and we
 		// want to manipulate it.
-		if ( cache[ id ] ) {
+		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 ] = {};
 		}
-		
+
 		// 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;
@@ -84,6 +103,11 @@ jQuery.fn.extend({
 	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(".");