git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Expose jQuery.uuid (use with caution) and make sure the expando property is used...
[jquery.git]
/
src
/
data.js
diff --git
a/src/data.js
b/src/data.js
index
b9986f5
..
a4c4e4b
100644
(file)
--- a/
src/data.js
+++ b/
src/data.js
@@
-1,9
+1,13
@@
-var expando = "jQuery" + now(), uuid = 0, windowData = {};
+var windowData = {};
jQuery.extend({
cache: {},
jQuery.extend({
cache: {},
-
- expando:expando,
+
+ // Please use with caution
+ uuid: 0,
+
+ // Unique for each copy of jQuery on the page
+ expando: "jQuery" + jQuery.now(),
// The following elements throw uncatchable exceptions if you
// attempt to add expando properties to them.
// The following elements throw uncatchable exceptions if you
// attempt to add expando properties to them.
@@
-22,25
+26,29
@@
jQuery.extend({
windowData :
elem;
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 ) {
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
// Compute a unique ID for the element
- if ( !id ) {
- id = ++uuid;
+ } else if ( !id ) {
+ elem[ jQuery.expando ] = id = ++jQuery.uuid;
}
// Avoid generating a new cache unless none exists and we
// want to manipulate it.
if ( typeof name === "object" ) {
}
// 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 ] ) {
} else if ( !cache[ id ] ) {
- elem[ expando ] = id;
cache[ id ] = {};
}
cache[ id ] = {};
}
@@
-63,7
+71,8
@@
jQuery.extend({
windowData :
elem;
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 ) {
// If we want to remove a specific section of the element's data
if ( name ) {
@@
-79,7
+88,7
@@
jQuery.extend({
// Otherwise, we want to remove all of the element's data
} else {
// 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 ) {
delete elem[ jQuery.expando ];
} else if ( elem.removeAttribute ) {
@@
-87,7
+96,9
@@
jQuery.extend({
}
// Completely remove the data cache
}
// Completely remove the data cache
- delete cache[ id ];
+ if ( isNode ) {
+ delete cache[ id ];
+ }
}
}
});
}
}
});