Data: remove user data in cleanData

jbedard · mgol · commit 5fe76c663f8a · 2015-07-28T14:22:03.000+02:00
Fixes gh-2503 Closes gh-2480
diff --git a/src/manipulation.js b/src/manipulation.js
@@ -270,19 +270,24 @@ jQuery.extend({
 			i = 0;
 
 		for ( ; (elem = elems[ i ]) !== undefined; i++ ) {
-			if ( jQuery.acceptData( elem ) && (data = elem[ dataPriv.expando ])) {
-				if ( data.events ) {
-					for ( type in data.events ) {
-						if ( special[ type ] ) {
-							jQuery.event.remove( elem, type );
-
-						// This is a shortcut to avoid jQuery.event.remove's overhead
-						} else {
-							jQuery.removeEvent( elem, type, data.handle );
+			if ( jQuery.acceptData( elem ) ) {
+				if ( (data = elem[ dataPriv.expando ] ) ) {
+					if ( data.events ) {
+						for ( type in data.events ) {
+							if ( special[ type ] ) {
+								jQuery.event.remove( elem, type );
+
+							// This is a shortcut to avoid jQuery.event.remove's overhead
+							} else {
+								jQuery.removeEvent( elem, type, data.handle );
+							}
 						}
 					}
+					delete elem[ dataPriv.expando ];
+				}
+				if ( elem[ dataUser.expando ] ) {
+					delete elem[ dataUser.expando ];
 				}
-				delete elem[ dataPriv.expando ];
 			}
 		}
 	}
diff --git a/test/unit/manipulation.js b/test/unit/manipulation.js
@@ -2064,7 +2064,7 @@ test( "jQuery.cleanData", function() {
 });
 
 test( "jQuery.cleanData eliminates all private data (gh-2127)", function() {
-	expect( 2 );
+	expect( 3 );
 
 	var div = jQuery( "<div/>" ).appendTo( "#qunit-fixture" );
 
@@ -2074,12 +2074,34 @@ test( "jQuery.cleanData eliminates all private data (gh-2127)", function() {
 
 	div.remove();
 
+	ok( !jQuery.hasData( div[ 0 ] ), "Removed element hasData should return false" );
+
 	ok( jQuery.isEmptyObject( jQuery._data( div[ 0 ] ) ),
 		"Private data is empty after node is removed" );
 
 	div.remove();
 });
 
+test( "jQuery.cleanData eliminates all public data", function() {
+	expect( 2 );
+
+	var key,
+		div = jQuery( "<div/>" );
+	div.data( "some", "data" );
+	ok( !jQuery.isEmptyObject( jQuery.data( div[ 0 ] ) ),  "Ensure some public data exists" );
+
+	div.remove();
+
+	ok( !jQuery.hasData( div[ 0 ] ), "Removed element hasData should return false" );
+
+	// Make sure the expando is gone
+	for ( key in div[ 0 ] ) {
+		if ( /^jQuery/.test( key ) ) {
+			ok( false, "Expando was not removed when there was no more data" );
+		}
+	}
+});
+
 test( "domManip plain-text caching (trac-6779)", function() {
 
 	expect( 1 );

Original file line number	Diff line number	Diff line change
`@@ -270,19 +270,24 @@ jQuery.extend({`
`270`	`270`	`i = 0;`
`271`	`271`
`272`	`272`	`for ( ; (elem = elems[ i ]) !== undefined; i++ ) {`
`273`		`- if ( jQuery.acceptData( elem ) && (data = elem[ dataPriv.expando ])) {`
`274`		`- if ( data.events ) {`
`275`		`- for ( type in data.events ) {`
`276`		`- if ( special[ type ] ) {`
`277`		`- jQuery.event.remove( elem, type );`
`278`		`-`
`279`		`- // This is a shortcut to avoid jQuery.event.remove's overhead`
`280`		`- } else {`
`281`		`- jQuery.removeEvent( elem, type, data.handle );`
	`273`	`+ if ( jQuery.acceptData( elem ) ) {`
	`274`	`+ if ( (data = elem[ dataPriv.expando ] ) ) {`
	`275`	`+ if ( data.events ) {`
	`276`	`+ for ( type in data.events ) {`
	`277`	`+ if ( special[ type ] ) {`
	`278`	`+ jQuery.event.remove( elem, type );`
	`279`	`+`
	`280`	`+ // This is a shortcut to avoid jQuery.event.remove's overhead`
	`281`	`+ } else {`
	`282`	`+ jQuery.removeEvent( elem, type, data.handle );`
	`283`	`+ }`
`282`	`284`	`}`
`283`	`285`	`}`
	`286`	`+ delete elem[ dataPriv.expando ];`
	`287`	`+ }`
	`288`	`+ if ( elem[ dataUser.expando ] ) {`
	`289`	`+ delete elem[ dataUser.expando ];`
`284`	`290`	`}`
`285`		`- delete elem[ dataPriv.expando ];`
`286`	`291`	`}`
`287`	`292`	`}`
`288`	`293`	`}`