github/jquery
1
1
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2026-02-06 10:25:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

Make .data(Object) extend the existing data object. Fixes #6692.

Browse Source
This commit is contained in:
jeresig
2010-09-22 11:52:32 -04:00
parent 626624a19a
commit 0b4b3ee8a5
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/data.js
View File

@@ -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() {