X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fmanipulation.js;h=73b0de31d6b1189da5bf07f3ed529707c2bef427;hb=19cd84cf3261ee412a2521df73dcf9d6cfba04a3;hp=501383816ed3cb30b0b0f4656ff4132215ef684f;hpb=0790989eb60df9df884837c05f90bab14df0704e;p=jquery.git

diff --git a/src/manipulation.js b/src/manipulation.js
index 5013838..73b0de3 100644
--- a/src/manipulation.js
+++ b/src/manipulation.js
@@ -4,6 +4,7 @@ var rinlinejQuery = / jQuery\d+="(?:\d+|null)"/g,
 	rselfClosing = /^(?:abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i,
 	rtagName = /<(\w+)/,
 	rtbody = /<tbody/i,
+	rhtml = /</,
 	fcloseTag = function(all, front, tag){
 		return rselfClosing.test(tag) ?
 			all :
@@ -106,15 +107,29 @@ 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 {
+			var set = jQuery.isFunction(arguments[0]) ?
+				jQuery( arguments[0]() ) :
+				jQuery.apply(jQuery, arguments);
+
+			return this.pushStack( set.add( this ), "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 {
+			return jQuery.isFunction(arguments[0]) ?
+				this.add( arguments[0]() ) :
+				this.add.apply( this, arguments );
+		}
 	},
 
 	clone: function( events ) {
@@ -174,15 +189,15 @@ jQuery.fn.extend({
 
 		// See if we can take a shortcut and just use innerHTML
 		} else if ( typeof value === "string" && !/<script/i.test( value ) &&
+			this[0] && !jQuery.isXMLDoc( this[0] ) &&
 			!wrapMap[ (rtagName.exec( value ) || ["", ""])[1].toLowerCase() ] ) {
 
 			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;
 				}
-
-				this[i].innerHTML = value;
 			}
 
 		} else {
@@ -193,7 +208,11 @@ jQuery.fn.extend({
 	},
 
 	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 ) {
@@ -215,7 +234,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;
@@ -350,7 +369,10 @@ 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);