X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fdata.js;h=eb96b860f74b9dea789a8921b5ecbc11e471f459;hb=2084e01780b57e5becbb00817b883175ef67b0b5;hp=a4c4e4b6da23ea38cf29531eec9f3c2c232ae85e;hpb=1533bf7c7794d8e078e7ce5e36de6d190651540a;p=jquery.git

diff --git a/src/data.js b/src/data.js
index a4c4e4b..eb96b86 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;
@@ -46,13 +47,28 @@ jQuery.extend({
 		// Avoid generating a new cache unless none exists and we
 		// want to manipulate it.
 		if ( typeof name === "object" ) {
-			cache[ id ] = jQuery.extend(true, {}, name);
+			if ( isNode ) {
+				cache[ id ] = jQuery.extend(true, {}, name);
+			} else {
+				store = jQuery.extend(true, {}, name);
+				cache[ id ] = function() {
+					return store;
+				};
+			}
 
 		} else if ( !cache[ id ] ) {
-			cache[ id ] = {};
+			if ( isNode ) {
+				cache[ id ] = {};
+			} else {
+				store = {};
+				cache[ id ] = function() {
+					return store;
+				};
+			}
+			
 		}
 
-		thisCache = cache[ id ];
+		thisCache = isNode ? cache[ id ] : cache[ id ]();
 
 		// Prevent overriding the named cache with undefined values
 		if ( data !== undefined ) {
@@ -71,8 +87,12 @@ jQuery.extend({
 			windowData :
 			elem;
 
-		var id = elem[ jQuery.expando ], cache = jQuery.cache,
-			isNode = elem.nodeType, thisCache = isNode ? cache[ id ] : id;
+		var isNode = elem.nodeType,
+			id = elem[ jQuery.expando ], cache = jQuery.cache;
+		if ( id && !isNode ) {
+			id = id();
+		}
+		var thisCache = cache[ id ];
 
 		// If we want to remove a specific section of the element's data
 		if ( name ) {
@@ -129,6 +149,7 @@ jQuery.fn.extend({
 		} else {
 			return this.trigger("setData" + parts[1] + "!", [parts[0], value]).each(function() {
 				jQuery.data( this, key, value );
+				jQuery.event.trigger( "changeData" + parts[1] + "!", [parts[0], value], this );
 			});
 		}
 	},