Commit b819be3e authored by Michał Gołębiowski's avatar Michał Gołębiowski

Manipulation: Remove an internal argument to the remove method

(cherry-picked from 349edbd6c53aa93d4fd207d3c0c4c24a7b0314dd)

Fixes gh-2301
Closes gh-2366
parent 473d2db9
...@@ -233,6 +233,28 @@ function domManip( collection, args, callback, ignored ) { ...@@ -233,6 +233,28 @@ function domManip( collection, args, callback, ignored ) {
return collection; return collection;
} }
function remove( elem, selector, keepData ) {
var node,
elems = selector ? jQuery.filter( selector, elem ) : elem,
i = 0;
for ( ; (node = elems[i]) != null; i++ ) {
if ( !keepData && node.nodeType === 1 ) {
jQuery.cleanData( getAll( node ) );
}
if ( node.parentNode ) {
if ( keepData && jQuery.contains( node.ownerDocument, node ) ) {
setGlobalEval( getAll( node, "script" ) );
}
node.parentNode.removeChild( node );
}
}
return elem;
}
jQuery.extend({ jQuery.extend({
htmlPrefilter: function( html ) { htmlPrefilter: function( html ) {
return html.replace( rxhtmlTag, "<$1></$2>" ); return html.replace( rxhtmlTag, "<$1></$2>" );
...@@ -350,6 +372,14 @@ jQuery.extend({ ...@@ -350,6 +372,14 @@ jQuery.extend({
}); });
jQuery.fn.extend({ jQuery.fn.extend({
detach: function( selector ) {
return remove( this, selector, true );
},
remove: function( selector ) {
return remove( this, selector );
},
text: function( value ) { text: function( value ) {
return access( this, function( value ) { return access( this, function( value ) {
return value === undefined ? return value === undefined ?
...@@ -394,28 +424,6 @@ jQuery.fn.extend({ ...@@ -394,28 +424,6 @@ jQuery.fn.extend({
}); });
}, },
remove: function( selector, keepData /* Internal Use Only */ ) {
var elem,
elems = selector ? jQuery.filter( selector, this ) : this,
i = 0;
for ( ; (elem = elems[i]) != null; i++ ) {
if ( !keepData && elem.nodeType === 1 ) {
jQuery.cleanData( getAll( elem ) );
}
if ( elem.parentNode ) {
if ( keepData && jQuery.contains( elem.ownerDocument, elem ) ) {
setGlobalEval( getAll( elem, "script" ) );
}
elem.parentNode.removeChild( elem );
}
}
return this;
},
empty: function() { empty: function() {
var elem, var elem,
i = 0; i = 0;
...@@ -508,10 +516,6 @@ jQuery.fn.extend({ ...@@ -508,10 +516,6 @@ jQuery.fn.extend({
// Force callback invocation // Force callback invocation
}, ignored ); }, ignored );
},
detach: function( selector ) {
return this.remove( selector, true );
} }
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment