X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fdata.js;h=44aff0fd379cad97e8fd919e5ced3c1b53d79bec;hb=813886a4dff0cf4be62fea51c3ae8be9ef88e12a;hp=1d993fe5827cac1c79a004815b7925bc1426c342;hpb=ebad701751689b773afe29d1e3c4532c7810d02a;p=jquery.git

diff --git a/src/data.js b/src/data.js
index 1d993fe..44aff0f 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;
@@ -43,6 +55,10 @@ jQuery.extend({
 	},
 
 	removeData: function( elem, name ) {
+		if ( elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()] ) {
+			return;
+		}
+
 		elem = elem == window ?
 			windowData :
 			elem;