git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix for issues discussed in 9faab0b74fd316c2161612236d9ea8a01f3c78f8. Goes towards...
[jquery.git]
/
src
/
data.js
diff --git
a/src/data.js
b/src/data.js
index
cddd8bd
..
eb96b86
100644
(file)
--- a/
src/data.js
+++ b/
src/data.js
@@
-1,9
+1,13
@@
-var expando = "jQuery" + 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.
@@
-23,7
+27,8
@@
jQuery.extend({
elem;
var id = elem[ jQuery.expando ], cache = jQuery.cache, thisCache,
elem;
var id = elem[ jQuery.expando ], cache = jQuery.cache, thisCache,
- isNode = elem.nodeType;
+ isNode = elem.nodeType,
+ store;
if ( !id && typeof name === "string" && data === undefined ) {
return;
if ( !id && typeof name === "string" && data === undefined ) {
return;
@@
-36,19
+41,34
@@
jQuery.extend({
// Compute a unique ID for the element
} else if ( !id ) {
// Compute a unique ID for the element
} else if ( !id ) {
- elem[ jQuery.expando ] = id = ++uuid;
+ 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" ) {
- cache[ id ] = jQuery.extend(true, {}, name);
+ if ( isNode ) {
+ cache[ id ] = jQuery.extend(true, {}, name);
+ } else {
+ store = jQuery.extend(true, {}, name);
+ cache[ id ] = function() {
+ return store;
+ };
+ }
} else if ( !cache[ id ] ) {
} else if ( !cache[ id ] ) {
- cache[ id ] = {};
+ if ( isNode ) {
+ cache[ id ] = {};
+ } else {
+ store = {};
+ cache[ id ] = function() {
+ return store;
+ };
+ }
+
}
}
- thisCache = cache[ id ];
+ thisCache = isNode ? cache[ id ] : cache[ id ]();
// Prevent overriding the named cache with undefined values
if ( data !== undefined ) {
// Prevent overriding the named cache with undefined values
if ( data !== undefined ) {
@@
-67,8
+87,12
@@
jQuery.extend({
windowData :
elem;
windowData :
elem;
- var id = elem[ jQuery.expando ], cache = jQuery.cache,
- isNode = elem.nodeType, thisCache = isNode ? cache[ id ] : id;
+ var isNode = elem.nodeType,
+ id = elem[ jQuery.expando ], cache = jQuery.cache;
+ if ( id && !isNode ) {
+ id = id();
+ }
+ var thisCache = cache[ 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 ) {
@@
-125,6
+149,7
@@
jQuery.fn.extend({
} else {
return this.trigger("setData" + parts[1] + "!", [parts[0], value]).each(function() {
jQuery.data( this, key, value );
} else {
return this.trigger("setData" + parts[1] + "!", [parts[0], value]).each(function() {
jQuery.data( this, key, value );
+ jQuery.event.trigger( "changeData" + parts[1] + "!", [parts[0], value], this );
});
}
},
});
}
},