deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Attach data directly to plain objects, no reason to use the central jQuery.cache. Fixes #6189.

Browse source
This commit is contained in:
jeresig 2010-02-27 09:49:58 -05:00
parent 42568db4c4
commit a49e6b6313
2 changed files with 28 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/data.js
View file

@ -3,7 +3,7 @@ var expando = "jQuery" + now(), uuid = 0, windowData = {};
jQuery.extend({
cache: {},
expando:expando,
expando: expando,
// The following elements throw uncatchable exceptions if you
// attempt to add expando properties to them.
@ -22,25 +22,29 @@ jQuery.extend({
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;
}
// 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 ] = {};
}
@ -63,7 +67,8 @@ jQuery.extend({
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 ) {
@ -79,7 +84,7 @@ jQuery.extend({
// Otherwise, we want to remove all of the element's data
} else {
if ( jQuery.support.deleteExpando ) {
if ( jQuery.support.deleteExpando || !isNode ) {
delete elem[ jQuery.expando ];
} else if ( elem.removeAttribute ) {
@ -87,7 +92,9 @@ jQuery.extend({
}
// Completely remove the data cache
delete cache[ id ];
if ( isNode ) {
delete cache[ id ];
}
}
}
});