X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fdata.js;h=c524a457dfa2c817a0f7dfe6d3b9bcd3b84aa785;hb=266facc08a2e1c8cb5a7a60de304da47657f2227;hp=cddd8bdead0042476124e1a61652651fa74c0a6a;hpb=8effe3a7dee91c833cc1774646da9d743600c64c;p=jquery.git

diff --git a/src/data.js b/src/data.js
index cddd8bd..c524a45 100644
--- a/src/data.js
+++ b/src/data.js
@@ -1,9 +1,13 @@
-var expando = "jQuery" + jQuery.now(), uuid = 0, windowData = {};
+var windowData = {};
 
 jQuery.extend({
 	cache: {},
-	
-	expando: expando,
+
+	// Please use with caution
+	uuid: 0,
+
+	// Unique for each copy of jQuery on the page	
+	expando: "jQuery" + jQuery.now(),
 
 	// The following elements throw uncatchable exceptions if you
 	// attempt to add expando properties to them.
@@ -36,19 +40,33 @@ jQuery.extend({
 
 		// Compute a unique ID for the element
 		} else if ( !id ) {
-			elem[ jQuery.expando ] = id = ++uuid;
+			elem[ jQuery.expando ] = id = ++jQuery.uuid;
 		}
 
 		// 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 {
+				cache[ id ] = function() {
+					return jQuery.extend(true, {}, name);
+				};
+			}
 
 		} else if ( !cache[ id ] ) {
-			cache[ id ] = {};
+			if ( isNode ) {
+				cache[ id ] = {};
+			} else {
+				var 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 ) {
@@ -67,8 +85,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 ) {
@@ -125,6 +147,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 );
 			});
 		}
 	},