Only detach the incoming elements to replaceWith if they're DOM nodes. Fixes #5986.

diff --git a/src/manipulation.js b/src/manipulation.js
index 2dccc759255574810ac6881e4d4c4b25ba6ea079..6f0373daa224c0df88c7c7c1baac71fd892a459f 100644 (file)
--- a/src/manipulation.js
+++ b/src/manipulation.js
@@ -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;
 

diff --git a/test/unit/manipulation.js b/test/unit/manipulation.js
index f921ea190518a5780bffb1f2c3829adda22dfcfa..41ce8bb16c5cc3d839bd46b89ecebe9e1100a820 100644 (file)
--- a/test/unit/manipulation.js
+++ b/test/unit/manipulation.js
@@ -650,7 +650,7 @@ test("insertAfter(String|Element|Array<Element>|jQuery)", function() {
 });
 
 var testReplaceWith = function(val) {
-       expect(15);
+       expect(17);
        jQuery('#yahoo').replaceWith(val( '<b id="replace">buga</b>' ));
        ok( jQuery("#replace")[0], 'Replace element with string' );
        ok( !jQuery("#yahoo")[0], 'Verify that original element is gone, after string' );
@@ -660,6 +660,12 @@ var testReplaceWith = function(val) {
        ok( jQuery("#first")[0], 'Replace element with element' );
        ok( !jQuery("#yahoo")[0], 'Verify that original element is gone, after element' );
 
+       reset();
+       jQuery("#main").append('<div id="bar"><div id="baz">Foo</div></div>');
+       jQuery('#baz').replaceWith("Baz");
+       equals( jQuery("#bar").text(),"Baz", 'Replace element with text' );
+       ok( !jQuery("#baz")[0], 'Verify that original element is gone, after element' );
+
        reset();
        jQuery('#yahoo').replaceWith(val( [document.getElementById('first'), document.getElementById('mark')] ));
        ok( jQuery("#first")[0], 'Replace element with array of elements' );
@@ -721,7 +727,7 @@ test("replaceWith(String|Element|Array&lt;Element&gt;|jQuery)", function() {
 test("replaceWith(Function)", function() {
        testReplaceWith(functionReturningObj);
 
-       expect(16);
+       expect(18);
 
        var y = jQuery("#yahoo")[0];