Data: remove user data in cleanData

Fixes gh-2503
Closes gh-2480

diff --git a/src/manipulation.js b/src/manipulation.js
index 4bac1417faddcef99cf38bc15c03d9a0761596fa..00d65de5a32406b54f0c4d9342d43b30ce7ef7e5 100644 (file)
--- 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
index c1dac6993f99e5578ab6a6d62d8f484645633690..fffbf38ceaa1cb80d7f54d26995018518a0e90d2 100644 (file)
--- 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 );