X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fdata.js;h=d38d47d3c19114936a79b8b633a53d6b8409f37a;hb=cb40495b21bcb7802f3ab6ae0f837f2bf5b385ed;hp=6dcfb4c2278ca44ac595a2538ebd9e43b18f4ce6;hpb=9faab0b74fd316c2161612236d9ea8a01f3c78f8;p=jquery.git

diff --git a/src/data.js b/src/data.js
index 6dcfb4c..d38d47d 100644
--- a/src/data.js
+++ b/src/data.js
@@ -27,7 +27,8 @@ jQuery.extend({
 			elem;
 
 		var id = elem[ jQuery.expando ], cache = jQuery.cache, thisCache,
-			isNode = elem.nodeType;
+			isNode = elem.nodeType,
+			store;
 
 		if ( !id && typeof name === "string" && data === undefined ) {
 			return;
@@ -49,27 +50,25 @@ jQuery.extend({
 			if ( isNode ) {
 				cache[ id ] = jQuery.extend(true, {}, name);
 			} else {
+				store = jQuery.extend(true, {}, name);
 				cache[ id ] = function() {
-					return jQuery.extend(true, {}, name);
-				}
+					return store;
+				};
 			}
 
 		} else if ( !cache[ id ] ) {
 			if ( isNode ) {
 				cache[ id ] = {};
 			} else {
-				var store = {};
+				store = {};
 				cache[ id ] = function() {
 					return store;
-				}
+				};
 			}
 			
 		}
 
-		thisCache = cache[ id ];
-		if ( !isNode ) {
-			thisCache = thisCache();
-		}
+		thisCache = isNode ? cache[ id ] : cache[ id ]();
 
 		// Prevent overriding the named cache with undefined values
 		if ( data !== undefined ) {
@@ -144,13 +143,18 @@ jQuery.fn.extend({
 			if ( data === undefined && this.length ) {
 				data = jQuery.data( this[0], key );
 			}
+
 			return data === undefined && parts[1] ?
 				this.data( parts[0] ) :
 				data;
+
 		} else {
-			return this.trigger("setData" + parts[1] + "!", [parts[0], value]).each(function() {
+			return this.each(function() {
+				var $this = jQuery( this ), args = [ parts[0], value ];
+
+				$this.triggerHandler( "setData" + parts[1] + "!", args );
 				jQuery.data( this, key, value );
-				jQuery.event.trigger( "changeData" + parts[1] + "!", [parts[0], value], this );
+				$this.triggerHandler( "changeData" + parts[1] + "!", args );
 			});
 		}
 	},