Merge branch 'bug_6158' of https://github.com/jboesch/jquery into jboesch-bug_6158

diff --git a/src/manipulation.js b/src/manipulation.js
index ba31697..27f81cc 100644 (file)
--- a/src/manipulation.js
+++ b/src/manipulation.js
@@ -261,7 +261,9 @@ jQuery.fn.extend({
                                }
                        });
                } else {
-                       return this.pushStack( jQuery(jQuery.isFunction(value) ? value() : value), "replaceWith", value );
+                       return this.length ?
+                               this.pushStack( jQuery(jQuery.isFunction(value) ? value() : value), "replaceWith", value ) :
+                               this;
                }
        },
 

diff --git a/test/unit/manipulation.js b/test/unit/manipulation.js
index 34425ed..ff3dff1 100644 (file)
--- a/test/unit/manipulation.js
+++ b/test/unit/manipulation.js
@@ -739,7 +739,7 @@ test("insertAfter(String|Element|Array<Element>|jQuery)", function() {
 });
 
 var testReplaceWith = function(val) {
-       expect(20);
+       expect(21);
        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' );
@@ -800,6 +800,9 @@ var testReplaceWith = function(val) {
        equals( set[0].nodeName.toLowerCase(), "span", "Replace the disconnected node." );
        equals( set.length, 1, "Replace the disconnected node." );
 
+       var non_existant = jQuery('#does-not-exist').replaceWith( val("<b>should not throw an error</b>") );
+       equals( non_existant.length, 0, "Length of non existant element." );
+
        var $div = jQuery("<div class='replacewith'></div>").appendTo("body");
        // TODO: Work on jQuery(...) inline script execution
        //$div.replaceWith("<div class='replacewith'></div><script>" +
@@ -827,7 +830,7 @@ test("replaceWith(String|Element|Array&lt;Element&gt;|jQuery)", function() {
 test("replaceWith(Function)", function() {
        testReplaceWith(functionReturningObj);
 
-       expect(21);
+       expect(22);
 
        var y = jQuery("#yahoo")[0];