Skip to content
Permalink
Browse files

Only detach the incoming elements to replaceWith if they're DOM nodes…

…. Fixes #5986.
  • Loading branch information
iamnoah authored and jeresig committed Feb 2, 2010
1 parent e76ba32 commit 8660ea1ab61dd16aec1ed24ec549c6258292b96a
Showing with 13 additions and 6 deletions.
  1. +5 −4 src/manipulation.js
  2. +8 −2 test/unit/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;

@@ -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];

0 comments on commit 8660ea1

Please sign in to comment.
You can’t perform that action at this time.