X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmanipulation.js;h=7128d11cfb46a82d1b78999a0d6d1476332ad695;hb=ebad701751689b773afe29d1e3c4532c7810d02a;hp=30ba5abf5ae3008515c538ecd7d4c0935369d07d;hpb=9d8d74569c8114f9c9b0f42bca71536e154c5944;p=jquery.git

diff --git a/src/manipulation.js b/src/manipulation.js
index 30ba5ab..7128d11 100644
--- a/src/manipulation.js
+++ b/src/manipulation.js
@@ -1,30 +1,51 @@
 var rinlinejQuery = / jQuery\d+="(?:\d+|null)"/g,
 	rleadingWhitespace = /^\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)/,
+	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;
@@ -71,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 ) {
@@ -88,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 ) {
@@ -127,21 +168,8 @@ jQuery.fn.extend({
 
 		// Copy the events from the original to the clone
 		if ( events === true ) {
-			var orig = this.find("*").andSelf(), i = 0;
-
-			ret.find("*").andSelf().each(function(){
-				if ( this.nodeName !== orig[i].nodeName ) { return; }
-
-				var events = jQuery.data( orig[i], "events" );
-
-				for ( var type in events ) {
-					for ( var handler in events[ type ] ) {
-						jQuery.event.add( this, type, events[ type ][ handler ], events[ type ][ handler ].data );
-					}
-				}
-
-				i++;
-			});
+			cloneCopyEvent( this, ret );
+			cloneCopyEvent( this.find("*"), ret.find("*") );
 		}
 
 		// Return the cloned set
@@ -149,15 +177,53 @@ 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.each(function(){
+				var next = this.nextSibling, parent = this.parentNode;
+
+				jQuery(this).remove();
+
+				if ( next ) {
+					jQuery(next).before( value );
+				} else {
+					jQuery(parent).append( value );
+				}
+			});
+		} else {
+			return this.pushStack( jQuery(jQuery.isFunction(value) ? value() : value), "replaceWith", value );
+		}
 	},
 
 	detach: function( selector ) {
@@ -179,7 +245,7 @@ jQuery.fn.extend({
 			if ( args[0] && args[0].parentNode && args[0].parentNode.nodeType === 11 ) {
 				results = { fragment: args[0].parentNode };
 			} else {
-				results = buildFragment( args, this[0], scripts );
+				results = buildFragment( args, this, scripts );
 			}
 
 			first = results.fragment.firstChild;
@@ -215,6 +281,24 @@ jQuery.fn.extend({
 	}
 });
 
+function cloneCopyEvent(orig, ret) {
+	var i = 0;
+
+	ret.each(function(){
+		if ( this.nodeName !== orig[i].nodeName ) {
+			return;
+		}
+
+		var events = jQuery.data( orig[i], "events" );
+
+		for ( var type in events ) {
+			for ( var handler in events[ type ] ) {
+				jQuery.event.add( this, type, events[ type ][ handler ], events[ type ][ handler ].data );
+			}
+		}
+	});
+}
+
 function buildFragment(args, nodes, scripts){
 	var fragment, cacheable, cached, cacheresults, doc;
 
@@ -259,17 +343,17 @@ 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({
 	// keepData is for internal use only--do not document
 	remove: function( selector, keepData ) {
-		if ( !selector || jQuery.multiFilter( selector, [ this ] ).length ) {
+		if ( !selector || jQuery.filter( selector, [ this ] ).length ) {
 			if ( !keepData && this.nodeType === 1 ) {
-				cleanData( jQuery("*", this).add(this) );
+				cleanData( this.getElementsByTagName("*") );
+				cleanData( [ this ] );
 			}
 
 			if ( this.parentNode ) {
@@ -281,7 +365,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
@@ -314,46 +398,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, 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;
 				}
 
@@ -362,7 +423,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>
@@ -412,9 +473,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 ];
 		}
 	}