From: Oleg Date: Wed, 19 Dec 2012 22:27:45 +0000 (+0400) Subject: Simplify jQuery.expando X-Git-Tag: 2.0.0b1~59^2~35 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d552b94463010b6abeeed5227f67c00c06ff31ff;p=jquery.git Simplify jQuery.expando --- diff --git a/src/manipulation.js b/src/manipulation.js index 513c4cfd2..134b3a800 100644 --- a/src/manipulation.js +++ b/src/manipulation.js @@ -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 ]; } } }