Skip to content
Permalink
Browse files

Split out the fragment-building code from domManip. Switched core.js …

…to using that instead. Also moved the standalone tag detection to $(...) for performance.
  • Loading branch information
jeresig committed Sep 7, 2009
1 parent b7d4e0e commit 9d8d74569c8114f9c9b0f42bca71536e154c5944
Showing with 58 additions and 42 deletions.
  1. +17 −2 src/core.js
  2. +40 −39 src/manipulation.js
  3. +1 −1 test/unit/core.js
@@ -31,6 +31,9 @@ var jQuery = function( selector, context ) {
// Used for trimming whitespace
rtrim = /^\s+|\s+$/g,

// Match a standalone tag
rsingleTag = /^<(\w+)\s*\/?>$/,

// Keep a UserAgent string for use with jQuery.browser
userAgent = navigator.userAgent.toLowerCase(),

@@ -41,7 +44,7 @@ var jQuery = function( selector, context ) {

jQuery.fn = jQuery.prototype = {
init: function( selector, context ) {
var match, elem, ret;
var match, elem, ret, doc;

// Handle $(""), $(null), or $(undefined)
if ( !selector ) {
@@ -70,7 +73,19 @@ jQuery.fn = jQuery.prototype = {

// HANDLE: $(html) -> $(array)
if ( match[1] ) {
selector = jQuery.clean( [ match[1] ], context );
doc = (context ? context.ownerDocument || context : document);

// If a single string is passed in and it's a single tag
// just do a createElement and skip the rest
ret = rsingleTag.exec( selector );

if ( ret ) {
selector = [ doc.createElement( ret[1] ) ];

} else {
ret = buildFragment( [ match[1] ], [ doc ] );
selector = (ret.cacheable ? ret.fragment.cloneNode(true) : ret.fragment).childNodes;
}

// HANDLE: $("#id")
} else {
@@ -1,6 +1,5 @@
var rinlinejQuery = / jQuery\d+="(?:\d+|null)"/g,
rleadingWhitespace = /^\s+/,
rsingleTag = /^<(\w+)\s*\/?>$/,
rxhtmlTag = /(<(\w+)[^>]*?)\/>/g,
rselfClosing = /^(?:abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i,
rinsideTable = /^<(thead|tbody|tfoot|colg|cap)/,
@@ -166,8 +165,7 @@ jQuery.fn.extend({
},

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() {
@@ -177,23 +175,14 @@ jQuery.fn.extend({
}

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" );
@@ -203,20 +192,16 @@ jQuery.fn.extend({
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;
@@ -230,6 +215,33 @@ jQuery.fn.extend({
}
});

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({
@@ -284,24 +296,15 @@ jQuery.each({
});

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'
if ( typeof context.createElement === "undefined" ) {
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 = rsingleTag.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" ) {
@@ -393,7 +396,7 @@ jQuery.extend({

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 ) {
@@ -402,8 +405,6 @@ jQuery.extend({
fragment.appendChild( ret[i] );
}
}

return scripts;
}

return ret;
@@ -337,7 +337,7 @@ test("jQuery('html')", function() {
test("jQuery('html', context)", function() {
expect(1);

var $div = jQuery("<div/>");
var $div = jQuery("<div/>")[0];
var $span = jQuery("<span/>", $div);
equals($span.length, 1, "Verify a span created with a div context works, #1763");
});

0 comments on commit 9d8d745

Please sign in to comment.
You can’t perform that action at this time.