X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fdata.js;h=0049a9f4eaa907dcb8cb83bc06e457b564ffd5f3;hb=31f1e99500af6e57cfdd571272be193b4646fc09;hp=44d77a902634d10336b212d145dc3e339e2bf07a;hpb=59802928566b6be3a66d65e77c2418fff37e6f5f;p=jquery.git

diff --git a/src/data.js b/src/data.js
index 44d77a9..0049a9f 100644
--- a/src/data.js
+++ b/src/data.js
@@ -1,5 +1,4 @@
 var expando = "jQuery" + now(), uuid = 0, windowData = {};
-var emptyObject = {};
 
 jQuery.extend({
 	cache: {},
@@ -15,7 +14,7 @@ jQuery.extend({
 	},
 
 	data: function( elem, name, data ) {
-		if ( jQuery.noData[elem.nodeNode.toLowerCase()] ) {
+		if ( elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()] ) {
 			return;
 		}
 
@@ -25,8 +24,7 @@ jQuery.extend({
 
 		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;
 		}
 
@@ -37,25 +35,27 @@ jQuery.extend({
 
 		// 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 ) {
-		if ( jQuery.noData[elem.nodeNode.toLowerCase()] ) {
+		if ( elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()] ) {
 			return;
 		}
 
@@ -97,9 +97,14 @@ jQuery.extend({
 });
 
 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(".");
@@ -115,14 +120,14 @@ jQuery.fn.extend({
 				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 );
 		});
 	}