Clean up expando removal code - only try to delete the expando from an element if...

[jquery.git] / src / data.js

diff --git a/src/data.js b/src/data.js
index 20c134a..0e243ca 100644 (file)
--- a/src/data.js
+++ b/src/data.js
@@ -79,15 +79,8 @@ jQuery.extend({
 
                // Otherwise, we want to remove all of the element's data
                } else {
-                       // Clean up the element expando
-                       try {
+                       if ( jQuery.support.deleteExpando ) {
                                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 );
-                               }
                        }
 
                        // Completely remove the data cache
@@ -132,22 +125,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