diff options
| author | jeresig <jeresig@gmail.com> | 2010-09-22 11:52:32 -0400 |
|---|---|---|
| committer | jeresig <jeresig@gmail.com> | 2010-09-22 11:52:32 -0400 |
| commit | 0b4b3ee8a5eda75d8399b333cda54f6b319fe74c (patch) | |
| tree | 585dca3178834ae70d9e51597d20ae7019990142 /src/data.js | |
| parent | 626624a19a6cbd70b44da08ee2123ba79f8e2bb0 (diff) | |
| download | jquery-0b4b3ee8a5eda75d8399b333cda54f6b319fe74c.tar.gz jquery-0b4b3ee8a5eda75d8399b333cda54f6b319fe74c.zip | |
Make .data(Object) extend the existing data object. Fixes #6692.
Diffstat (limited to 'src/data.js')
| -rw-r--r-- | src/data.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/data.js b/src/data.js index b7a6ab972..ac082dd6e 100644 --- a/src/data.js +++ b/src/data.js @@ -52,9 +52,10 @@ jQuery.extend({ // want to manipulate it. if ( typeof name === "object" ) { if ( isNode ) { - cache[ id ] = jQuery.extend(true, {}, name); + cache[ id ] = jQuery.extend(cache[ id ], name); + } else { - store = jQuery.extend(true, {}, name); + store = jQuery.extend(cache[ id ], name); cache[ id ] = function() { return store; }; @@ -63,6 +64,7 @@ jQuery.extend({ } else if ( !cache[ id ] ) { if ( isNode ) { cache[ id ] = {}; + } else { store = {}; cache[ id ] = function() { |