jQuery.extend({
cache: {},
- expando:expando,
+ expando: expando,
// The following elements throw uncatchable exceptions if you
// attempt to add expando properties to them.
windowData :
elem;
- var id = elem[ expando ], cache = jQuery.cache, thisCache;
+ var id = elem[ jQuery.expando ], cache = jQuery.cache, thisCache,
+ isNode = elem.nodeType;
if ( !id && typeof name === "string" && data === undefined ) {
- return null;
+ return;
}
+ // Get the data from the object directly
+ if ( !isNode ) {
+ cache = elem;
+ id = jQuery.expando;
+
// Compute a unique ID for the element
- if ( !id ) {
- id = ++uuid;
+ } else if ( !id ) {
+ elem[ jQuery.expando ] = id = ++uuid;
}
// Avoid generating a new cache unless none exists and we
// want to manipulate it.
if ( typeof name === "object" ) {
- elem[ expando ] = id;
- thisCache = cache[ id ] = jQuery.extend(true, {}, name);
+ cache[ id ] = jQuery.extend(true, {}, name);
} else if ( !cache[ id ] ) {
- elem[ expando ] = id;
cache[ id ] = {};
}
windowData :
elem;
- var id = elem[ expando ], cache = jQuery.cache, thisCache = cache[ id ];
+ var id = elem[ jQuery.expando ], cache = jQuery.cache,
+ isNode = elem.nodeType, thisCache = isNode ? cache[ id ] : id;
// If we want to remove a specific section of the element's data
if ( name ) {
// 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 || !isNode ) {
+ delete elem[ jQuery.expando ];
+
+ } else if ( elem.removeAttribute ) {
+ elem.removeAttribute( jQuery.expando );
}
// Completely remove the data cache
- delete cache[ id ];
+ if ( isNode ) {
+ delete cache[ id ];
+ }
}
}
});
});
}
});
-
-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