aboutsummaryrefslogtreecommitdiffstats
path: root/src/data.js
diff options
context:
space:
mode:
authorDave Reed <dareed@microsoft.com>2010-07-23 11:25:31 -0400
committerjeresig <jeresig@gmail.com>2010-07-23 11:25:31 -0400
commit2084e01780b57e5becbb00817b883175ef67b0b5 (patch)
tree3777e9d58a8e7cbfbe9d6b297f0672d7cabac4b9 /src/data.js
parent266facc08a2e1c8cb5a7a60de304da47657f2227 (diff)
downloadjquery-2084e01780b57e5becbb00817b883175ef67b0b5.tar.gz
jquery-2084e01780b57e5becbb00817b883175ef67b0b5.zip
Fix for issues discussed in 9faab0b74fd316c2161612236d9ea8a01f3c78f8. Goes towards fixing #6808.
Diffstat (limited to 'src/data.js')
-rw-r--r--src/data.js10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/data.js b/src/data.js
index c524a457d..eb96b860f 100644
--- a/src/data.js
+++ b/src/data.js
@@ -27,7 +27,8 @@ jQuery.extend({
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;
@@ -49,8 +50,9 @@ jQuery.extend({
if ( isNode ) {
cache[ id ] = jQuery.extend(true, {}, name);
} else {
+ store = jQuery.extend(true, {}, name);
cache[ id ] = function() {
- return jQuery.extend(true, {}, name);
+ return store;
};
}
@@ -58,7 +60,7 @@ jQuery.extend({
if ( isNode ) {
cache[ id ] = {};
} else {
- var store = {};
+ store = {};
cache[ id ] = function() {
return store;
};
@@ -66,7 +68,7 @@ jQuery.extend({
}
- thisCache = isNode? cache[ id ] : cache[ id ]();
+ thisCache = isNode ? cache[ id ] : cache[ id ]();
// Prevent overriding the named cache with undefined values
if ( data !== undefined ) {