Make sure that the previous element is removed from the page before the next is inser...

diff --git a/src/manipulation.js b/src/manipulation.js
index baf99d52d90626792b8c966b6dda28e45dd6e097..7128d11cfb46a82d1b78999a0d6d1476332ad695 100644 (file)
--- a/src/manipulation.js
+++ b/src/manipulation.js
@@ -210,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 );
                }

diff --git a/test/unit/manipulation.js b/test/unit/manipulation.js
index ec96c10b887bc55679b1cee118166fd62ec91c17..c8ea240b8b473a63c9686ac496c24183203ed1ef 100644 (file)
--- a/test/unit/manipulation.js
+++ b/test/unit/manipulation.js
@@ -466,7 +466,7 @@ test("insertAfter(String|Element|Array<Element>|jQuery)", function() {
 });
 
 var testReplaceWith = function(val) {
-       expect(12);
+       expect(14);
        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' );
@@ -491,6 +491,13 @@ var testReplaceWith = function(val) {
        var set = jQuery("<div/>").replaceWith(val("<span>test</span>"));
        equals( set[0].nodeName.toLowerCase(), "span", "Replace the disconnected node." );
        equals( set.length, 1, "Replace the disconnected node." );
+
+       var $div = jQuery("<div class='replacewith'></div>").appendTo("body");
+       $div.replaceWith("<div class='replacewith'></div><script>" +
+               "equals(jQuery('.replacewith').length, 1, 'Check number of elements in page.');" +
+               "</script>");
+       equals(jQuery('.replacewith').length, 1, 'Check number of elements in page.');
+       jQuery('.replacewith').remove();
 }
 
 test("replaceWith(String|Element|Array&lt;Element&gt;|jQuery)", function() {