git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make sure that jQuery.data( elem ) always returns a data object, fixes #5971. Improve...
[jquery.git]
/
src
/
data.js
diff --git
a/src/data.js
b/src/data.js
index
e3dc190
..
0049a9f
100644
(file)
--- a/
src/data.js
+++ b/
src/data.js
@@
-1,5
+1,4
@@
var expando = "jQuery" + now(), uuid = 0, windowData = {};
var expando = "jQuery" + now(), uuid = 0, windowData = {};
-var emptyObject = {};
jQuery.extend({
cache: {},
jQuery.extend({
cache: {},
@@
-25,8
+24,7
@@
jQuery.extend({
var id = elem[ expando ], cache = jQuery.cache, thisCache;
var id = elem[ expando ], cache = jQuery.cache, thisCache;
- // Handle the case where there's no name immediately
- if ( !name && !id ) {
+ if ( !id && typeof name === "string" && data === undefined ) {
return null;
}
return null;
}
@@
-40,17
+38,16
@@
jQuery.extend({
if ( typeof name === "object" ) {
elem[ expando ] = id;
thisCache = cache[ id ] = jQuery.extend(true, {}, name);
if ( typeof name === "object" ) {
elem[ expando ] = id;
thisCache = cache[ id ] = jQuery.extend(true, {}, name);
- } else if ( cache[ id ] ) {
- thisCache = cache[ id ];
- } else if ( typeof data === "undefined" ) {
- thisCache = emptyObject;
- } else {
- thisCache = cache[ id ] = {};
+
+ } else if ( !cache[ id ] ) {
+ elem[ expando ] = id;
+ cache[ id ] = {};
}
}
+ thisCache = cache[ id ];
+
// Prevent overriding the named cache with undefined values
if ( data !== undefined ) {
// Prevent overriding the named cache with undefined values
if ( data !== undefined ) {
- elem[ expando ] = id;
thisCache[ name ] = data;
}
thisCache[ name ] = data;
}