var expando = "jQuery" + now(), uuid = 0, windowData = {};
-var emptyObject = {};
jQuery.extend({
cache: {},
var id = elem[ expando ], cache = jQuery.cache, thisCache;
- // Handle the case where there's no name immediately
- if ( !name && !id ) {
+ if ( !id && typeof name === "string" && data === undefined ) {
return null;
}
// Avoid generating a new cache unless none exists and we
// want to manipulate it.
- if ( cache[ id ] ) {
- thisCache = cache[ id ];
- } else if ( typeof data === "undefined" ) {
- thisCache = emptyObject;
- } else {
- thisCache = cache[ id ] = {};
+ if ( typeof name === "object" ) {
+ elem[ expando ] = id;
+ thisCache = cache[ id ] = jQuery.extend(true, {}, name);
+
+ } else if ( !cache[ id ] ) {
+ elem[ expando ] = id;
+ cache[ id ] = {};
}
-
+
+ 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 ) {
// Otherwise, we want to remove all of the element's data
} else {
- // Clean up the element expando
- try {
+ if ( jQuery.support.deleteExpando ) {
delete elem[ expando ];
- } catch( e ) {
- // IE has trouble directly removing the expando
- // but it's ok with using removeAttribute
- if ( elem.removeAttribute ) {
- elem.removeAttribute( expando );
- }
}
// Completely remove the data cache
});
jQuery.fn.extend({
- data: function( key, value ){
+ 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(".");
this.data( parts[0] ) :
data;
} else {
- return this.trigger("setData" + parts[1] + "!", [parts[0], value]).each(function(){
+ return this.trigger("setData" + parts[1] + "!", [parts[0], value]).each(function() {
jQuery.data( this, key, value );
});
}
},
- removeData: function( key ){
- return this.each(function(){
+ removeData: function( key ) {
+ return this.each(function() {
jQuery.removeData( this, key );
});
}