From: jeresig Date: Thu, 28 Jan 2010 21:30:37 +0000 (-0500) Subject: Optimize for the case where a fragment-bound element is being injected into one other... X-Git-Url: http://git.asbjorn.biz/?a=commitdiff_plain;ds=sidebyside;h=0db207da238e879dad20f68178e6248750d3b984;p=jquery.git Optimize for the case where a fragment-bound element is being injected into one other element. --- diff --git a/src/core.js b/src/core.js index efdc457..81b4831 100644 --- a/src/core.js +++ b/src/core.js @@ -100,6 +100,8 @@ jQuery.fn = jQuery.prototype = { selector = (ret.cacheable ? ret.fragment.cloneNode(true) : ret.fragment).childNodes; } + return jQuery.merge( this, selector ); + // HANDLE: $("#id") } else { elem = document.getElementById( match[2] ); diff --git a/src/manipulation.js b/src/manipulation.js index ed049de..01c6b0b 100644 --- a/src/manipulation.js +++ b/src/manipulation.js @@ -415,13 +415,20 @@ jQuery.each({ }, function( name, original ) { jQuery.fn[ name ] = function( selector ) { var ret = [], insert = jQuery( selector ); - - for ( var i = 0, l = insert.length; i < l; i++ ) { - var elems = (i > 0 ? this.clone(true) : this).get(); - jQuery.fn[ original ].apply( jQuery(insert[i]), elems ); - ret = ret.concat( elems ); + + if ( this.length === 1 && this[0].parentNode && this[0].parentNode.nodeType === 11 && insert.length === 1 ) { + insert[ original ]( this[0] ); + return this; + + } else { + for ( var i = 0, l = insert.length; i < l; i++ ) { + var elems = (i > 0 ? this.clone(true) : this).get(); + jQuery.fn[ original ].apply( jQuery(insert[i]), elems ); + ret = ret.concat( elems ); + } + + return this.pushStack( ret, name, insert.selector ); } - return this.pushStack( ret, name, insert.selector ); }; }); @@ -436,13 +443,13 @@ jQuery.extend({ var ret = []; - jQuery.each(elems, function( i, elem ) { + for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) { if ( typeof elem === "number" ) { elem += ""; } if ( !elem ) { - return; + continue; } // Convert html string into DOM nodes @@ -493,7 +500,7 @@ jQuery.extend({ div.insertBefore( context.createTextNode( rleadingWhitespace.exec(elem)[0] ), div.firstChild ); } - elem = jQuery.makeArray( div.childNodes ); + elem = div.childNodes; } if ( elem.nodeType ) { @@ -501,13 +508,13 @@ jQuery.extend({ } else { ret = jQuery.merge( ret, elem ); } - - }); + } if ( fragment ) { for ( var i = 0; ret[i]; i++ ) { 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 ) { ret.splice.apply( ret, [i + 1, 0].concat(jQuery.makeArray(ret[i].getElementsByTagName("script"))) );