github/jquery
1
1
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2026-02-07 03:55:17 -05:00
Code Issues Packages Projects Releases Wiki Activity

Added support for .data(Object), overwriting the existing data object. Fixes #4284.

Browse Source
This commit is contained in:
John Resig
2009-12-09 13:16:18 -08:00
parent 4e27f17007
commit f6a0bf6816
2 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/data.js
View File

@@ -37,21 +37,24 @@ jQuery.extend({
// Avoid generating a new cache unless none exists and we
// want to manipulate it.
if ( cache[ id ] ) {
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 ] = {};
}
// Prevent overriding the named cache with undefined values
if ( data !== undefined ) {
elem[ expando ] = id;
thisCache[ name ] = data;
}
return name ? thisCache[ name ] : thisCache;
return typeof name === "string" ? thisCache[ name ] : thisCache;
},
removeData: function( elem, name ) {
@@ -100,6 +103,11 @@ jQuery.fn.extend({
data: function( key, value ){
if ( typeof key === "undefined" && this.length ) {
return jQuery.data( this[0] );
} else if ( typeof key === "object" ) {
return this.each(function() {
jQuery.data( this, key );
});
}
var parts = key.split(".");