+var rinlinejQuery = / jQuery\d+="(?:\d+|null)"/g,
+ rleadingWhitespace = /^\s+/,
+ rxhtmlTag = /(<(\w+)[^>]*?)\/>/g,
+ rselfClosing = /^(?:abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i,
+ rinsideTable = /^<(thead|tbody|tfoot|colg|cap)/,
+ rtbody = /<tbody/i,
+ fcloseTag = function(all, front, tag){
+ return rselfClosing.test(tag) ?
+ all :
+ front + "></" + tag + ">";
+ };
+
jQuery.fn.extend({
text: function( text ) {
if ( typeof text !== "object" && text !== undefined )
jQuery(this).wrapAll( html.apply(this, arguments) );
});
}
-
+
if ( this[0] ) {
// The elements to wrap the target around
var wrap = jQuery( html, this[0].ownerDocument ).eq(0).clone();
html = div.innerHTML;
}
- return jQuery.clean([html.replace(/ jQuery\d+="(?:\d+|null)"/g, "").replace(/^\s*/, "")], ownerDocument)[0];
- } else
+ return jQuery.clean([html.replace(rinlinejQuery, "")
+ .replace(rleadingWhitespace, "")], ownerDocument)[0];
+ } else {
return this.cloneNode(true);
+ }
});
// Copy the events from the original to the clone
html: function( value ) {
return value === undefined ?
(this[0] ?
- this[0].innerHTML.replace(/ jQuery\d+="(?:\d+|null)"/g, "") :
+ this[0].innerHTML.replace(rinlinejQuery, "") :
null) :
this.empty().append( value );
},
return this.after( value ).remove();
},
+ detach: function( selector ) {
+ return this.remove( selector, true );
+ },
+
domManip: function( args, table, callback ) {
- var fragment, scripts, cacheable, cached, cacheresults, first,
- value = args[0];
+ var results, first, value = args[0], scripts = [];
if ( jQuery.isFunction(value) ) {
return this.each(function() {
args[0] = value.call(this);
return jQuery(this).domManip( args, table, callback );
});
- };
+ }
if ( this[0] ) {
- if ( args.length === 1 && typeof args[0] === "string" && args[0].length < 512 && args[0].indexOf("<option") < 0 ) {
- cacheable = true;
- cacheresults = jQuery.fragments[ args[0] ];
- if ( cacheresults ) {
- if ( cacheresults !== 1 ) {
- fragment = cacheresults;
- }
- cached = true;
- }
- }
-
- if ( !fragment ) {
- fragment = (this[0].ownerDocument || this[0]).createDocumentFragment();
- scripts = jQuery.clean( args, (this[0].ownerDocument || this[0]), fragment );
+ // If we're in a fragment, just use that instead of building a new one
+ if ( args[0] && args[0].parentNode && args[0].parentNode.nodeType === 11 ) {
+ results = { fragment: args[0].parentNode };
+ } else {
+ results = buildFragment( args, this[0], scripts );
}
- first = fragment.firstChild;
+ first = results.fragment.firstChild;
if ( first ) {
table = table && jQuery.nodeName( first, "tr" );
table ?
root(this[i], first) :
this[i],
- cacheable || this.length > 1 || i > 0 ?
- fragment.cloneNode(true) :
- fragment
+ results.cacheable || this.length > 1 || i > 0 ?
+ results.fragment.cloneNode(true) :
+ results.fragment
);
}
}
if ( scripts ) {
jQuery.each( scripts, evalScript );
}
-
- if ( cacheable ) {
- jQuery.fragments[ args[0] ] = cacheresults ? fragment : 1;
- }
}
return this;
}
});
+function buildFragment(args, nodes, scripts){
+ var fragment, cacheable, cached, cacheresults, doc;
+
+ if ( args.length === 1 && typeof args[0] === "string" && args[0].length < 512 && args[0].indexOf("<option") < 0 ) {
+ cacheable = true;
+ cacheresults = jQuery.fragments[ args[0] ];
+ if ( cacheresults ) {
+ if ( cacheresults !== 1 ) {
+ fragment = cacheresults;
+ }
+ cached = true;
+ }
+ }
+
+ if ( !fragment ) {
+ doc = (nodes && nodes[0] ? nodes[0].ownerDocument || nodes[0] : document);
+ fragment = doc.createDocumentFragment();
+ jQuery.clean( args, doc, fragment, scripts );
+ }
+
+ if ( cacheable ) {
+ jQuery.fragments[ args[0] ] = cacheresults ? fragment : 1;
+ }
+
+ return { fragment: fragment, cacheable: cacheable };
+}
+
jQuery.fragments = {};
jQuery.each({
});
jQuery.each({
- remove: function( selector ) {
+ // keepData is for internal use only--do not document
+ remove: function( selector, keepData ) {
if ( !selector || jQuery.multiFilter( selector, [ this ] ).length ) {
- if ( this.nodeType === 1 ) {
+ if ( !keepData && this.nodeType === 1 ) {
cleanData( jQuery("*", this).add(this) );
}
if ( this.parentNode ) {
- this.parentNode.removeChild( this );
+ this.parentNode.removeChild( this );
}
}
},
});
jQuery.extend({
- clean: function( elems, context, fragment ) {
+ clean: function( elems, context, fragment, scripts ) {
context = context || document;
// !context.createElement fails in IE with an error but returns typeof 'object'
context = context.ownerDocument || context[0] && context[0].ownerDocument || document;
}
- // If a single string is passed in and it's a single tag
- // just do a createElement and skip the rest
- if ( !fragment && elems.length === 1 && typeof elems[0] === "string" ) {
- var match = /^<(\w+)\s*\/?>$/.exec(elems[0]);
- if ( match )
- return [ context.createElement( match[1] ) ];
- }
-
- var ret = [], scripts = [], div = context.createElement("div");
+ var ret = [], div = context.createElement("div");
jQuery.each(elems, function(i, elem){
if ( typeof elem === "number" ) {
// Convert html string into DOM nodes
if ( typeof elem === "string" ) {
// Fix "XHTML"-style tags in all browsers
- elem = elem.replace(/(<(\w+)[^>]*?)\/>/g, function(all, front, tag){
- return /^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i.test(tag) ?
- all :
- front + "></" + tag + ">";
- });
+ elem = elem.replace(rxhtmlTag, fcloseTag);
// Trim whitespace, otherwise indexOf won't work as expected
- var tags = elem.replace(/^\s+/, "").substring(0, 10).toLowerCase();
+ var tags = elem.replace(rleadingWhitespace, "")
+ .substring(0, 10).toLowerCase();
var wrap =
// option or optgroup
!tags.indexOf("<leg") &&
[ 1, "<fieldset>", "</fieldset>" ] ||
- /^<(thead|tbody|tfoot|colg|cap)/.test(tags) &&
+ rinsideTable.test(tags) &&
[ 1, "<table>", "</table>" ] ||
!tags.indexOf("<tr") &&
if ( !jQuery.support.tbody ) {
// String was a <table>, *may* have spurious <tbody>
- var hasBody = /<tbody/i.test(elem),
+ var hasBody = rtbody.test(elem),
tbody = !tags.indexOf("<table") && !hasBody ?
div.firstChild && div.firstChild.childNodes :
}
// IE completely kills leading whitespace when innerHTML is used
- if ( !jQuery.support.leadingWhitespace && /^\s/.test( elem ) ) {
- div.insertBefore( context.createTextNode( /^\s*/.exec(elem)[0] ), div.firstChild );
+ if ( !jQuery.support.leadingWhitespace && rleadingWhitespace.test( elem ) ) {
+ div.insertBefore( context.createTextNode( rleadingWhitespace.exec(elem)[0] ), div.firstChild );
}
elem = jQuery.makeArray( div.childNodes );
if ( fragment ) {
for ( var i = 0; ret[i]; i++ ) {
- if ( jQuery.nodeName( ret[i], "script" ) && (!ret[i].type || ret[i].type.toLowerCase() === "text/javascript") ) {
+ if ( scripts && jQuery.nodeName( ret[i], "script" ) && (!ret[i].type || ret[i].type.toLowerCase() === "text/javascript") ) {
scripts.push( ret[i].parentNode ? ret[i].parentNode.removeChild( ret[i] ) : ret[i] );
} else {
- if ( ret[i].nodeType === 1 )
+ if ( ret[i].nodeType === 1 ) {
ret.splice.apply( ret, [i + 1, 0].concat(jQuery.makeArray(ret[i].getElementsByTagName("script"))) );
+ }
fragment.appendChild( ret[i] );
}
}
-
- return scripts;
}
return ret;
git.asbjorn.biz / jquery.git / blobdiff