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

diff --git a/src/data.js b/src/data.js
index 20c134a..b9986f5 100644
--- a/src/data.js
+++ b/src/data.js
@@ -79,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
@@ -132,22 +128,3 @@ jQuery.fn.extend({
 		});
 	}
 });
-
-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