Make sure that undefined is always returned for undefined data properties. Fixes...

[jquery.git] / src / data.js

diff --git a/src/data.js b/src/data.js
index 20c134a..a97ac04 100644 (file)
--- 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
@@ -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