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 .data(Object) extend the existing data object. Fixes #6692.
[jquery.git]
/
src
/
data.js
diff --git
a/src/data.js
b/src/data.js
index
b7a6ab9
..
ac082dd
100644
(file)
--- a/
src/data.js
+++ b/
src/data.js
@@
-52,9
+52,10
@@
jQuery.extend({
// want to manipulate it.
if ( typeof name === "object" ) {
if ( isNode ) {
// want to manipulate it.
if ( typeof name === "object" ) {
if ( isNode ) {
- cache[ id ] = jQuery.extend(true, {}, name);
+ cache[ id ] = jQuery.extend(cache[ id ], name);
+
} else {
} else {
- store = jQuery.extend(true, {}, name);
+ store = jQuery.extend(cache[ id ], name);
cache[ id ] = function() {
return store;
};
cache[ id ] = function() {
return store;
};
@@
-63,6
+64,7
@@
jQuery.extend({
} else if ( !cache[ id ] ) {
if ( isNode ) {
cache[ id ] = {};
} else if ( !cache[ id ] ) {
if ( isNode ) {
cache[ id ] = {};
+
} else {
store = {};
cache[ id ] = function() {
} else {
store = {};
cache[ id ] = function() {