Using data() on JavaScript objects sets fields directly on the object. Note that events are now a property of a function (to avoid JSON serialization - and only in the case of JavaScript objects, not DOM nodes). Fixes #6807.

2 files changed, 60 insertions, 33 deletions

diff --git a/src/data.js b/src/data.js
index 43ab5955c..66d24c42a 100644
--- a/src/data.js
+++ b/src/data.js
@@ -30,18 +30,17 @@ jQuery.extend({
 			windowData :
 			elem;
 
-		var id = elem[ jQuery.expando ], cache = jQuery.cache, thisCache,
-			isNode = elem.nodeType,
-			store;
+		var isNode = elem.nodeType,
+			id = isNode ? elem[ jQuery.expando ] : null,
+			cache = jQuery.cache, thisCache;
 
-		if ( !id && typeof name === "string" && data === undefined ) {
+		if ( isNode && !id && typeof name === "string" && data === undefined ) {
 			return;
 		}
 
 		// Get the data from the object directly
 		if ( !isNode ) {
 			cache = elem;
-			id = jQuery.expando;
 
 		// Compute a unique ID for the element
 		} else if ( !id ) {
@@ -55,26 +54,14 @@ jQuery.extend({
 				cache[ id ] = jQuery.extend(cache[ id ], name);
 
 			} else {
-				store = jQuery.extend(cache[ id ], name);
-				cache[ id ] = function() {
-					return store;
-				};
+				jQuery.extend( cache, name );
 			}
 
-		} else if ( !cache[ id ] ) {
-			if ( isNode ) {
-				cache[ id ] = {};
-
-			} else {
-				store = {};
-				cache[ id ] = function() {
-					return store;
-				};
-			}
-			
+		} else if ( isNode && !cache[ id ] ) {
+			cache[ id ] = {};
 		}
 
-		thisCache = isNode ? cache[ id ] : cache[ id ]();
+		thisCache = isNode ? cache[ id ] : cache;
 
 		// Prevent overriding the named cache with undefined values
 		if ( data !== undefined ) {
@@ -94,11 +81,9 @@ jQuery.extend({
 			elem;
 
 		var isNode = elem.nodeType,
-			id = elem[ jQuery.expando ], cache = jQuery.cache;
-		if ( id && !isNode ) {
-			id = id();
-		}
-		var thisCache = cache[ id ];
+			id = isNode ? elem[ jQuery.expando ] : elem,
+			cache = jQuery.cache,
+			thisCache = isNode ? cache[ id ] : id;
 
 		// If we want to remove a specific section of the element's data
 		if ( name ) {
@@ -107,23 +92,28 @@ jQuery.extend({
 				delete thisCache[ name ];
 
 				// If we've removed all the data, remove the element's cache
-				if ( jQuery.isEmptyObject(thisCache) ) {
+				if ( isNode && jQuery.isEmptyObject(thisCache) ) {
 					jQuery.removeData( elem );
 				}
 			}
 
 		// Otherwise, we want to remove all of the element's data
 		} else {
-			if ( jQuery.support.deleteExpando || !isNode ) {
+			if ( isNode && jQuery.support.deleteExpando ) {
 				delete elem[ jQuery.expando ];
 
 			} else if ( elem.removeAttribute ) {
 				elem.removeAttribute( jQuery.expando );
-			}
 
 			// Completely remove the data cache
-			if ( isNode ) {
+			} else if ( isNode ) {
 				delete cache[ id ];
+
+			// Remove all fields from the object
+			} else {
+				for ( var n in elem ) {
+					delete elem[ n ];
+				}
 			}
 		}
 	},
diff --git a/src/event.js b/src/event.js
index dcb872a73..5829948e6 100644
--- a/src/event.js
+++ b/src/event.js
@@ -54,8 +54,25 @@ jQuery.event = {
 			return;
 		}
 
-		var events = elemData.events = elemData.events || {},
+		var events = elemData.events,
 			eventHandle = elemData.handle;
+			
+		if ( typeof events === "function" ) {
+			// On plain objects events is a fn that holds the the data
+			// which prevents this data from being JSON serialized
+			// the function does not need to be called, it just contains the data
+			eventHandle = events.handle;
+			events = events.events;
+
+		} else if ( !events ) {
+			if ( !elem.nodeType ) {
+				// On plain objects, create a fn that acts as the holder
+				// of the values to avoid JSON serialization of event data
+				elemData.events = elemData = function(){};
+			}
+
+			elemData.events = events = {};
+		}
 
 		if ( !eventHandle ) {
 			elemData.handle = eventHandle = function() {
@@ -159,6 +176,11 @@ jQuery.event = {
 		if ( !elemData || !events ) {
 			return;
 		}
+		
+		if ( typeof events === "function" ) {
+			elemData = events;
+			events = events.events;
+		}
 
 		// types is actually an event object here
 		if ( types && types.type ) {
@@ -259,7 +281,10 @@ jQuery.event = {
 			delete elemData.events;
 			delete elemData.handle;
 
-			if ( jQuery.isEmptyObject( elemData ) ) {
+			if ( typeof elemData === "function" ) {
+				delete elem.events;
+
+			} else if ( jQuery.isEmptyObject( elemData ) ) {
 				jQuery.removeData( elem );
 			}
 		}
@@ -319,7 +344,10 @@ jQuery.event = {
 		event.currentTarget = elem;
 
 		// Trigger the event, it is assumed that "handle" is a function
-		var handle = jQuery.data( elem, "handle" );
+		var handle = elem.nodeType ?
+			jQuery.data( elem, "handle" ) :
+			elem.events && elem.events.handle;
+
 		if ( handle ) {
 			handle.apply( elem, data );
 		}
@@ -393,6 +421,11 @@ jQuery.event = {
 		event.namespace = event.namespace || namespace_sort.join(".");
 
 		events = jQuery.data(this, "events");
+
+		if ( typeof events === "function" ) {
+			events = events.events;
+		}
+
 		handlers = (events || {})[ event.type ];
 
 		if ( events && handlers ) {
@@ -1007,6 +1040,10 @@ function liveHandler( event ) {
 		related, match, handleObj, elem, j, i, l, data, close, namespace, ret,
 		events = jQuery.data( this, "events" );
 
+	if ( typeof events === "function" ) {
+		events = events.events;
+	}
+
 	// Make sure we avoid non-left-click bubbling in Firefox (#3861)
 	if ( event.liveFired === this || !events || !events.live || event.button && event.type === "click" ) {
 		return;