X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fmanipulation.js;h=708de893c59ddebc4689b5875db5f832bd2904a1;hb=d74389997106b02cf513f573a0d7197ecc511514;hp=2dccc759255574810ac6881e4d4c4b25ba6ea079;hpb=f95147f465932cb91e1a6aace50c556820ca4074;p=jquery.git

diff --git a/src/manipulation.js b/src/manipulation.js
index 2dccc75..708de89 100644
--- a/src/manipulation.js
+++ b/src/manipulation.js
@@ -4,7 +4,7 @@ var rinlinejQuery = / jQuery\d+="(?:\d+|null)"/g,
 	rselfClosing = /^(?:area|br|col|embed|hr|img|input|link|meta|param)$/i,
 	rtagName = /<([\w:]+)/,
 	rtbody = /<tbody/i,
-	rhtml = /<|&\w+;/,
+	rhtml = /<|&#?\w+;/,
 	rnocache = /<script|<object|<embed/i,
 	rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,  // checked="checked" or checked (html5)
 	fcloseTag = function( all, front, tag ) {
@@ -197,7 +197,7 @@ jQuery.fn.extend({
 				// as properties will not be copied (such as the
 				// the name attribute on an input).
 				var html = this.outerHTML, ownerDocument = this.ownerDocument;
-				if ( !html || jQuery.nodeName( this, "form" ) ) {
+				if ( !html ) {
 					var div = ownerDocument.createElement("div");
 					div.appendChild( this.cloneNode(true) );
 					html = div.innerHTML;
@@ -268,16 +268,17 @@ jQuery.fn.extend({
 		if ( this[0] && this[0].parentNode ) {
 			// Make sure that the elements are removed from the DOM before they are inserted
 			// this can help fix replacing a parent with child elements
-			if ( !jQuery.isFunction( value ) ) {
-				value = jQuery( value ).detach();
-
-			} else {
+			if ( jQuery.isFunction( value ) ) {
 				return this.each(function(i) {
 					var self = jQuery(this), old = self.html();
 					self.replaceWith( value.call( this, i, old ) );
 				});
 			}
 
+			if ( typeof value !== "string" ) {
+				value = jQuery(value).detach();
+			}
+
 			return this.each(function() {
 				var next = this.nextSibling, parent = this.parentNode;