X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fmanipulation.js;h=2a6b9dc3009064efa1e995bfe117690158bad5e2;hb=255068da33e3d131b3a641c041fb8cecb1543fa4;hp=0051bbc0b343452c931a2cd99abdcb588dbd8167;hpb=0ac9898d6b7200075d20e36d7c31ad77585c8778;p=jquery.git

diff --git a/src/manipulation.js b/src/manipulation.js
index 0051bbc..2a6b9dc 100644
--- a/src/manipulation.js
+++ b/src/manipulation.js
@@ -1,26 +1,51 @@
 var rinlinejQuery = / jQuery\d+="(?:\d+|null)"/g,
 	rleadingWhitespace = /^\s+/,
-	rsingleTag = /^<(\w+)\s*\/?>$/,
-	rxhtmlTag = /(<(\w+)[^>]*?)\/>/g,
+	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;
+	rtagName = /<([\w:]+)/,
+	rtbody = /<tbody/i,
+	rhtml = /<|&\w+;/,
+	fcloseTag = function(all, front, tag){
+		return rselfClosing.test(tag) ?
+			all :
+			front + "></" + tag + ">";
+	},
+	wrapMap = {
+		option: [ 1, "<select multiple='multiple'>", "</select>" ],
+		legend: [ 1, "<fieldset>", "</fieldset>" ],
+		thead: [ 1, "<table>", "</table>" ],
+		tr: [ 2, "<table><tbody>", "</tbody></table>" ],
+		td: [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ],
+		col: [ 2, "<table><tbody></tbody><colgroup>", "</colgroup></table>" ],
+		_default: [ 0, "", "" ]
+	};
+
+wrapMap.optgroup = wrapMap.option;
+wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
+wrapMap.th = wrapMap.td;
+
+// IE can't serialize <link> and <script> tags normally
+if ( !jQuery.support.htmlSerialize ) {
+	wrapMap._default = [ 1, "div<div>", "</div>" ];
+}
 
 jQuery.fn.extend({
 	text: function( text ) {
-		if ( typeof text !== "object" && text !== undefined )
+		if ( typeof text !== "object" && text !== undefined ) {
 			return this.empty().append( (this[0] && this[0].ownerDocument || document).createTextNode( text ) );
+		}
 
 		var ret = "";
 
-		jQuery.each( text || this, function(){
-			jQuery.each( this.childNodes, function(){
-				if ( this.nodeType !== 8 ) {
-					ret += this.nodeType !== 1 ?
-						this.nodeValue :
-						jQuery.fn.text( [ this ] );
-				}
-			});
+		jQuery.each( this, function() {
+			// Get the text from text nodes and CDATA nodes
+			if ( this.nodeType === 3 || this.nodeType === 4 ) {
+				ret += this.nodeValue;
+
+			// Traverse everything else, except comment nodes
+			} else if ( this.nodeType !== 8 ) {
+				ret += jQuery.fn.text.call( this.childNodes );
+			}
 		});
 
 		return ret;
@@ -32,7 +57,7 @@ jQuery.fn.extend({
 				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();
@@ -67,6 +92,14 @@ jQuery.fn.extend({
 		});
 	},
 
+	unwrap: function() {
+		return this.parent().each(function(){
+			if ( !jQuery.nodeName( this, "body" ) ) {
+				jQuery( this ).replaceWith( this.childNodes );
+			}
+		}).end();
+	},
+	
 	append: function() {
 		return this.domManip(arguments, true, function(elem){
 			if ( this.nodeType === 1 ) {
@@ -84,15 +117,27 @@ jQuery.fn.extend({
 	},
 
 	before: function() {
-		return this.domManip(arguments, false, function(elem){
-			this.parentNode.insertBefore( elem, this );
-		});
+		if ( this[0] && this[0].parentNode ) {
+			return this.domManip(arguments, false, function(elem){
+				this.parentNode.insertBefore( elem, this );
+			});
+		} else if ( arguments.length ) {
+			var set = jQuery(arguments[0]);
+			set.push.apply( set, this.toArray() );
+			return this.pushStack( set, "before", arguments );
+		}
 	},
 
 	after: function() {
-		return this.domManip(arguments, false, function(elem){
-			this.parentNode.insertBefore( elem, this.nextSibling );
-		});
+		if ( this[0] && this[0].parentNode ) {
+			return this.domManip(arguments, false, function(elem){
+				this.parentNode.insertBefore( elem, this.nextSibling );
+			});
+		} else if ( arguments.length ) {
+			var set = this.pushStack( this, "after", arguments );
+			set.push.apply( set, jQuery(arguments[0]).toArray() );
+			return set;
+		}
 	},
 
 	clone: function( events ) {
@@ -145,20 +190,51 @@ jQuery.fn.extend({
 	},
 
 	html: function( value ) {
-		return value === undefined ?
-			(this[0] ?
+		if ( value === undefined ) {
+			return this[0] ?
 				this[0].innerHTML.replace(rinlinejQuery, "") :
-				null) :
+				null;
+
+		// See if we can take a shortcut and just use innerHTML
+		} else if ( typeof value === "string" && !/<script/i.test( value ) &&
+			(!jQuery.support.leadingWhitespace || !rleadingWhitespace.test( value )) &&
+			!wrapMap[ (rtagName.exec( value ) || ["", ""])[1].toLowerCase() ] ) {
+
+			try {
+				for ( var i = 0, l = this.length; i < l; i++ ) {
+					// Remove element nodes and prevent memory leaks
+					if ( this[i].nodeType === 1 ) {
+						cleanData( this[i].getElementsByTagName("*") );
+						this[i].innerHTML = value;
+					}
+				}
+
+			// If using innerHTML throws an exception, use the fallback method
+			} catch(e) {
+				this.empty().append( value );
+			}
+
+		} else {
 			this.empty().append( value );
+		}
+
+		return this;
 	},
 
 	replaceWith: function( value ) {
-		return this.after( value ).remove();
+		if ( this[0] && this[0].parentNode ) {
+			return this.after( value ).remove();
+		} else {
+			return this.pushStack( jQuery(jQuery.isFunction(value) ? value() : value), "replaceWith", value );
+		}
+	},
+
+	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() {
@@ -168,23 +244,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, scripts );
 			}
 
-			first = fragment.firstChild;
+			first = results.fragment.firstChild;
 
 			if ( first ) {
 				table = table && jQuery.nodeName( first, "tr" );
@@ -194,9 +261,9 @@ 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
 					);
 				}
 			}
@@ -204,10 +271,6 @@ jQuery.fn.extend({
 			if ( scripts ) {
 				jQuery.each( scripts, evalScript );
 			}
-
-			if ( cacheable ) {
-				jQuery.fragments[ args[0] ] = cacheresults ? fragment : 1;
-			}
 		}
 
 		return this;
@@ -221,6 +284,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({
@@ -238,20 +328,21 @@ jQuery.each({
 			jQuery.fn[ original ].apply( jQuery(insert[i]), elems );
 			ret = ret.concat( elems );
 		}
-
-		return this.pushStack( ret, name, selector );
+		return this.pushStack( ret, name, insert.selector );
 	};
 });
 
 jQuery.each({
-	remove: function( selector ) {
-		if ( !selector || jQuery.multiFilter( selector, [ this ] ).length ) {
-			if ( this.nodeType === 1 ) {
-				cleanData( jQuery("*", this).add(this) );
+	// keepData is for internal use only--do not document
+	remove: function( selector, keepData ) {
+		if ( !selector || jQuery.filter( selector, [ this ] ).length ) {
+			if ( !keepData && this.nodeType === 1 ) {
+				cleanData( this.getElementsByTagName("*") );
+				cleanData( [ this ] );
 			}
 
 			if ( this.parentNode ) {
-				this.parentNode.removeChild( this );
+				 this.parentNode.removeChild( this );
 			}
 		}
 	},
@@ -259,7 +350,7 @@ jQuery.each({
 	empty: function() {
 		// Remove element nodes and prevent memory leaks
 		if ( this.nodeType === 1 ) {
-			cleanData( jQuery("*", this) );
+			cleanData( this.getElementsByTagName("*") );
 		}
 
 		// Remove any remaining nodes
@@ -274,7 +365,7 @@ 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'
@@ -282,16 +373,7 @@ jQuery.extend({
 			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" ) {
@@ -301,50 +383,23 @@ jQuery.extend({
 			if ( !elem ) { return; }
 
 			// Convert html string into DOM nodes
-			if ( typeof elem === "string" ) {
+			if ( typeof elem === "string" && !rhtml.test( elem ) ) {
+				elem = context.createTextNode( elem );
+
+			} else if ( typeof elem === "string" ) {
 				// Fix "XHTML"-style tags in all browsers
-				elem = elem.replace(rxhtmlTag, function(all, front, tag){
-					return rselfClosing.test(tag) ?
-						all :
-						front + "></" + tag + ">";
-				});
+				elem = elem.replace(rxhtmlTag, fcloseTag);
 
 				// Trim whitespace, otherwise indexOf won't work as expected
-				var tags = elem.replace(rleadingWhitespace, "")
-					.substring(0, 10).toLowerCase();
-
-				var wrap =
-					// option or optgroup
-					!tags.indexOf("<opt") &&
-					[ 1, "<select multiple='multiple'>", "</select>" ] ||
-
-					!tags.indexOf("<leg") &&
-					[ 1, "<fieldset>", "</fieldset>" ] ||
-
-					rinsideTable.test(tags) &&
-					[ 1, "<table>", "</table>" ] ||
-
-					!tags.indexOf("<tr") &&
-					[ 2, "<table><tbody>", "</tbody></table>" ] ||
-
-				 	// <thead> matched above
-					(!tags.indexOf("<td") || !tags.indexOf("<th")) &&
-					[ 3, "<table><tbody><tr>", "</tr></tbody></table>" ] ||
-
-					!tags.indexOf("<col") &&
-					[ 2, "<table><tbody></tbody><colgroup>", "</colgroup></table>" ] ||
-
-					// IE can't serialize <link> and <script> tags normally
-					!jQuery.support.htmlSerialize &&
-					[ 1, "div<div>", "</div>" ] ||
-
-					[ 0, "", "" ];
+				var tag = (rtagName.exec( elem ) || ["", ""])[1].toLowerCase(),
+					wrap = wrapMap[ tag ] || wrapMap._default,
+					depth = wrap[0];
 
 				// Go to html and back, then peel off extra wrappers
 				div.innerHTML = wrap[1] + elem + wrap[2];
 
 				// Move to the right depth
-				while ( wrap[0]-- ) {
+				while ( depth-- ) {
 					div = div.lastChild;
 				}
 
@@ -353,7 +408,7 @@ jQuery.extend({
 
 					// String was a <table>, *may* have spurious <tbody>
 					var hasBody = rtbody.test(elem),
-						tbody = !tags.indexOf("<table") && !hasBody ?
+						tbody = tag === "table" && !hasBody ?
 							div.firstChild && div.firstChild.childNodes :
 
 							// String was a bare <thead> or <tfoot>
@@ -387,7 +442,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 ) {
@@ -396,8 +451,6 @@ jQuery.extend({
 					fragment.appendChild( ret[i] );
 				}
 			}
-
-			return scripts;
 		}
 
 		return ret;
@@ -405,9 +458,8 @@ jQuery.extend({
 });
 
 function cleanData( elems ) {
-	for ( var i = 0, l = elems.length; i < l; i++ ) {
-		var id = elems[i][expando];
-		if ( id ) {
+	for ( var i = 0, elem, id; (elem = elems[i]) != null; i++ ) {
+		if ( (id = elem[expando]) ) {
 			delete jQuery.cache[ id ];
 		}
 	}