Skip to content

Commit 349edbd

Browse files
committed
Manipulation: Remove an internal argument to the remove method
Fixes gh-2301 Closes gh-2366
1 parent 04a2969 commit 349edbd

File tree

1 file changed

+29
-25
lines changed

1 file changed

+29
-25
lines changed

src/manipulation.js

Lines changed: 29 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,27 @@ function domManip( collection, args, callback, ignored ) {
196196
return collection;
197197
}
198198

199+
function remove( elem, selector, keepData ) {
200+
var node,
201+
nodes = selector ? jQuery.filter( selector, elem ) : elem,
202+
i = 0;
203+
204+
for ( ; (node = nodes[i]) != null; i++ ) {
205+
if ( !keepData && node.nodeType === 1 ) {
206+
jQuery.cleanData( getAll( node ) );
207+
}
208+
209+
if ( node.parentNode ) {
210+
if ( keepData && jQuery.contains( node.ownerDocument, node ) ) {
211+
setGlobalEval( getAll( node, "script" ) );
212+
}
213+
node.parentNode.removeChild( node );
214+
}
215+
}
216+
217+
return elem;
218+
}
219+
199220
jQuery.extend({
200221
htmlPrefilter: function( html ) {
201222
return html.replace( rxhtmlTag, "<$1></$2>" );
@@ -268,6 +289,14 @@ jQuery.extend({
268289
});
269290

270291
jQuery.fn.extend({
292+
detach: function( selector ) {
293+
return remove( this, selector, true );
294+
},
295+
296+
remove: function( selector ) {
297+
return remove( this, selector );
298+
},
299+
271300
text: function( value ) {
272301
return access( this, function( value ) {
273302
return value === undefined ?
@@ -314,27 +343,6 @@ jQuery.fn.extend({
314343
});
315344
},
316345

317-
remove: function( selector, keepData /* Internal Use Only */ ) {
318-
var elem,
319-
elems = selector ? jQuery.filter( selector, this ) : this,
320-
i = 0;
321-
322-
for ( ; (elem = elems[i]) != null; i++ ) {
323-
if ( !keepData && elem.nodeType === 1 ) {
324-
jQuery.cleanData( getAll( elem ) );
325-
}
326-
327-
if ( elem.parentNode ) {
328-
if ( keepData && jQuery.contains( elem.ownerDocument, elem ) ) {
329-
setGlobalEval( getAll( elem, "script" ) );
330-
}
331-
elem.parentNode.removeChild( elem );
332-
}
333-
}
334-
335-
return this;
336-
},
337-
338346
empty: function() {
339347
var elem,
340348
i = 0;
@@ -417,10 +425,6 @@ jQuery.fn.extend({
417425

418426
// Force callback invocation
419427
}, ignored );
420-
},
421-
422-
detach: function( selector ) {
423-
return this.remove( selector, true );
424428
}
425429
});
426430

0 commit comments

Comments
 (0)