Skip to content

Commit b819be3

Browse files
committed
Manipulation: Remove an internal argument to the remove method
(cherry-picked from 349edbd) Fixes gh-2301 Closes gh-2366
1 parent 473d2db commit b819be3

File tree

1 file changed

+30
-26
lines changed

1 file changed

+30
-26
lines changed

src/manipulation.js

Lines changed: 30 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,28 @@ function domManip( collection, args, callback, ignored ) {
233233
return collection;
234234
}
235235

236+
function remove( elem, selector, keepData ) {
237+
var node,
238+
elems = selector ? jQuery.filter( selector, elem ) : elem,
239+
i = 0;
240+
241+
for ( ; (node = elems[i]) != null; i++ ) {
242+
243+
if ( !keepData && node.nodeType === 1 ) {
244+
jQuery.cleanData( getAll( node ) );
245+
}
246+
247+
if ( node.parentNode ) {
248+
if ( keepData && jQuery.contains( node.ownerDocument, node ) ) {
249+
setGlobalEval( getAll( node, "script" ) );
250+
}
251+
node.parentNode.removeChild( node );
252+
}
253+
}
254+
255+
return elem;
256+
}
257+
236258
jQuery.extend({
237259
htmlPrefilter: function( html ) {
238260
return html.replace( rxhtmlTag, "<$1></$2>" );
@@ -350,6 +372,14 @@ jQuery.extend({
350372
});
351373

352374
jQuery.fn.extend({
375+
detach: function( selector ) {
376+
return remove( this, selector, true );
377+
},
378+
379+
remove: function( selector ) {
380+
return remove( this, selector );
381+
},
382+
353383
text: function( value ) {
354384
return access( this, function( value ) {
355385
return value === undefined ?
@@ -394,28 +424,6 @@ jQuery.fn.extend({
394424
});
395425
},
396426

397-
remove: function( selector, keepData /* Internal Use Only */ ) {
398-
var elem,
399-
elems = selector ? jQuery.filter( selector, this ) : this,
400-
i = 0;
401-
402-
for ( ; (elem = elems[i]) != null; i++ ) {
403-
404-
if ( !keepData && elem.nodeType === 1 ) {
405-
jQuery.cleanData( getAll( elem ) );
406-
}
407-
408-
if ( elem.parentNode ) {
409-
if ( keepData && jQuery.contains( elem.ownerDocument, elem ) ) {
410-
setGlobalEval( getAll( elem, "script" ) );
411-
}
412-
elem.parentNode.removeChild( elem );
413-
}
414-
}
415-
416-
return this;
417-
},
418-
419427
empty: function() {
420428
var elem,
421429
i = 0;
@@ -508,10 +516,6 @@ jQuery.fn.extend({
508516

509517
// Force callback invocation
510518
}, ignored );
511-
},
512-
513-
detach: function( selector ) {
514-
return this.remove( selector, true );
515519
}
516520
});
517521

0 commit comments

Comments
 (0)