aboutsummaryrefslogtreecommitdiffstats
path: root/src/manipulation.js
diff options
context:
space:
mode:
authorMichał Gołębiowski <m.goleb@gmail.com>2015-06-01 21:35:13 +0200
committerMichał Gołębiowski <m.goleb@gmail.com>2015-06-14 00:07:31 +0200
commit349edbd6c53aa93d4fd207d3c0c4c24a7b0314dd (patch)
tree41f730a73e4c945c59d50ed4656e82f12bc29e27 /src/manipulation.js
parent04a29696e5b176ac66401120e433d52425222f0f (diff)
downloadjquery-349edbd6c53aa93d4fd207d3c0c4c24a7b0314dd.tar.gz
jquery-349edbd6c53aa93d4fd207d3c0c4c24a7b0314dd.zip
Manipulation: Remove an internal argument to the remove method
Fixes gh-2301 Closes gh-2366
Diffstat (limited to 'src/manipulation.js')
-rw-r--r--src/manipulation.js54
1 files changed, 29 insertions, 25 deletions
diff --git a/src/manipulation.js b/src/manipulation.js
index 6424d8394..4bac1417f 100644
--- a/src/manipulation.js
+++ b/src/manipulation.js
@@ -196,6 +196,27 @@ function domManip( collection, args, callback, ignored ) {
return collection;
}
+function remove( elem, selector, keepData ) {
+ var node,
+ nodes = selector ? jQuery.filter( selector, elem ) : elem,
+ i = 0;
+
+ for ( ; (node = nodes[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({
htmlPrefilter: function( html ) {
return html.replace( rxhtmlTag, "<$1></$2>" );
@@ -268,6 +289,14 @@ jQuery.extend({
});
jQuery.fn.extend({
+ detach: function( selector ) {
+ return remove( this, selector, true );
+ },
+
+ remove: function( selector ) {
+ return remove( this, selector );
+ },
+
text: function( value ) {
return access( this, function( value ) {
return value === undefined ?
@@ -314,27 +343,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() {
var elem,
i = 0;
@@ -417,10 +425,6 @@ jQuery.fn.extend({
// Force callback invocation
}, ignored );
- },
-
- detach: function( selector ) {
- return this.remove( selector, true );
}
});