X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fdata.js;h=a97ac041949cd6d9c5c8f1608dbc5e66ec189df8;hb=9e06903a99caf5619d0db858ed3d24f0e6ee15db;hp=0049a9f4eaa907dcb8cb83bc06e457b564ffd5f3;hpb=eed69eccc54d010889b5d8495320538d7ceb4e51;p=jquery.git

diff --git a/src/data.js b/src/data.js
index 0049a9f..a97ac04 100644
--- a/src/data.js
+++ b/src/data.js
@@ -25,7 +25,7 @@ jQuery.extend({
 		var id = elem[ expando ], cache = jQuery.cache, thisCache;
 
 		if ( !id && typeof name === "string" && data === undefined ) {
-			return null;
+			return;
 		}
 
 		// Compute a unique ID for the element
@@ -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