X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fmanipulation.js;h=7128d11cfb46a82d1b78999a0d6d1476332ad695;hb=3afc6533e2396ac1752dc8ce677823f6506dd8dd;hp=b883567191c419bde322c0f04e64f215c8b64338;hpb=7638fc58354e295f96a2d948adcb1ce1c2da60b3;p=jquery.git

diff --git a/src/manipulation.js b/src/manipulation.js
index b883567..7128d11 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 :
@@ -31,19 +31,21 @@ if ( !jQuery.support.htmlSerialize ) {
 
 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;
@@ -90,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 ) {
@@ -111,12 +121,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 +133,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;
 		}
 	},
 
@@ -160,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
@@ -189,15 +184,21 @@ 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] ) &&
+			(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("*") );
-					this[i].innerHTML = value;
+			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 {
@@ -209,7 +210,17 @@ jQuery.fn.extend({
 
 	replaceWith: function( value ) {
 		if ( this[0] && this[0].parentNode ) {
-			return this.after( value ).remove();
+			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 );
 		}
@@ -270,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;
 
@@ -321,7 +350,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 ] );