X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fmanipulation.js;h=1699f680189012a72ea94334ea1e82affe6bf8de;hb=7c4144fab314d98b85303d01ab904bb711bc2ecc;hp=2a1e9237f4f03c6e4885ba6d2c66671d3e8fa656;hpb=fc4c6915344625fadf55ca25d3cf9094544d301a;p=jquery.git

diff --git a/src/manipulation.js b/src/manipulation.js
index 2a1e923..1699f68 100644
--- a/src/manipulation.js
+++ b/src/manipulation.js
@@ -1,10 +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 = /</,
+	rhtml = /<|&\w+;/,
 	fcloseTag = function(all, front, tag){
 		return rselfClosing.test(tag) ?
 			all :
@@ -90,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 ) {
@@ -111,12 +119,10 @@ jQuery.fn.extend({
 			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 );
+		} else if ( arguments.length ) {
+			var set = jQuery(arguments[0]);
+			set.push.apply( set, this.toArray() );
+			return this.pushStack( set, "before", arguments );
 		}
 	},
 
@@ -125,10 +131,10 @@ jQuery.fn.extend({
 			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 );
+		} else if ( arguments.length ) {
+			var set = this.pushStack( this, "after", arguments );
+			set.push.apply( set, jQuery(arguments[0]).toArray() );
+			return set;
 		}
 	},
 
@@ -327,7 +333,7 @@ jQuery.each({
 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 ] );