github/jquery
1
1
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2026-02-01 07:55:09 -05:00
Code Issues Packages Projects Releases Wiki Activity

Data: remove user data in cleanData

Browse Source 
Fixes gh-2503
Closes gh-2480
This commit is contained in:
Jason Bedard
2015-07-18 17:47:31 -07:00
committed by Michał Gołębiowski
parent 6044fb6a73
commit 5fe76c663f
2 changed files with 37 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/manipulation.js
View File

@@ -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 );
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 );
// 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 ];
}
}
}

24
test/unit/manipulation.js
View File

@@ -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 );