]> source.dussan.org Git - jquery.git/commitdiff
Simplify jQuery.expando
authorOleg <markelog@gmail.com>
Wed, 19 Dec 2012 22:27:45 +0000 (02:27 +0400)
committerOleg <markelog@gmail.com>
Sun, 23 Dec 2012 23:04:08 +0000 (03:04 +0400)
src/manipulation.js

index 513c4cfd2cf8f25e1dcd345350b0db4fe92b396c..134b3a80044dc4d6b0bab84e0412ebf8f3d0a644 100644 (file)
@@ -502,7 +502,6 @@ jQuery.extend({
                        i = 0,
                        internalKey = jQuery.expando,
                        cache = jQuery.cache,
-                       deleteExpando = jQuery.support.deleteExpando,
                        special = jQuery.event.special;
 
                for ( ; (elem = elems[ i ]) != null; i++ ) {
@@ -513,37 +512,20 @@ jQuery.extend({
                                data = id && cache[ id ];
 
                                if ( data ) {
-                                       if ( data.events ) {
-                                               for ( type in data.events ) {
-                                                       if ( special[ type ] ) {
-                                                               jQuery.event.remove( elem, type );
+                                       for ( type in data.events ) {
+                                               if ( special[ type ] ) {
+                                                       jQuery.event.remove( elem, type );
 
-                                                       // This is a shortcut to avoid jQuery.event.remove's overhead
-                                                       } else {
-                                                               jQuery.removeEvent( elem, type, data.handle );
-                                                       }
+                                               // This is a shortcut to avoid jQuery.event.remove's overhead
+                                               } else {
+                                                       jQuery.removeEvent( elem, type, data.handle );
                                                }
                                        }
 
                                        // Remove cache only if it was not already removed by jQuery.event.remove
                                        if ( cache[ id ] ) {
-
                                                delete cache[ id ];
-
-                                               // IE does not allow us to delete expando properties from nodes,
-                                               // nor does it have a removeAttribute function on Document nodes;
-                                               // we must handle all of these cases
-                                               if ( deleteExpando ) {
-                                                       delete elem[ internalKey ];
-
-                                               } else if ( elem.removeAttribute ) {
-                                                       elem.removeAttribute( internalKey );
-
-                                               } else {
-                                                       elem[ internalKey ] = null;
-                                               }
-
-                                               core_deletedIds.push( id );
+                                               delete elem[ internalKey ];
                                        }
                                }
                        }