X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fmanipulation.js;h=eea377b7eb6c5f20e5fa05883c30220d42ecd45f;hb=449e099b97d823ed0252d8821880bc0e471701ea;hp=95e2f7abf8792d418377dcddbdf0a31804d081dd;hpb=520f1a26845252dd6d7fd5f3b5bb7779ba91eb2c;p=jquery.git

diff --git a/src/manipulation.js b/src/manipulation.js
index 95e2f7a..eea377b 100644
--- a/src/manipulation.js
+++ b/src/manipulation.js
@@ -1,9 +1,10 @@
 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,
-	rtagName = /<(\w+)/,
+	rtagName = /<([\w:]+)/,
 	rtbody = /<tbody/i,
+	rhtml = /</,
 	fcloseTag = function(all, front, tag){
 		return rselfClosing.test(tag) ?
 			all :
@@ -89,6 +90,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 ) {
@@ -106,15 +115,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 ) {
@@ -174,15 +195,21 @@ jQuery.fn.extend({
 
 		// 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() ] ) {
 
-			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("*") );
+			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;
+					}
 				}
 
-				this[i].innerHTML = value;
+			// If using innerHTML throws an exception, use the fallback method
+			} catch(e) {
+				this.empty().append( value );
 			}
 
 		} else {
@@ -193,7 +220,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 +246,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;
@@ -295,15 +326,14 @@ 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( this.getElementsByTagName("*") );
 				cleanData( [ this ] );
@@ -351,7 +381,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);
 
@@ -423,9 +456,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 ];
 		}
 	}