Fix #1907 where the never-ending loop prevention used a coersion comparison which...

diff --git a/src/core.js b/src/core.js
index d12d5d3ace2004fe1104bb7ed6a264c6bc051eae..b036db89587a37ba3150b3d0e8f0d67ee17a1417 100644 (file)
--- a/src/core.js
+++ b/src/core.js
@@ -516,8 +516,14 @@ jQuery.extend = jQuery.fn.extend = function() {
        if ( target.constructor == Boolean ) {\r
                deep = target;\r
                target = arguments[1] || {};\r
+               // skip the boolean and the target\r
+               i = 2;\r
        }\r
 \r
+       // Handle case when target is a string or something (possible in deep copy)\r
+       if ( typeof target != "object" )\r
+               target = {};\r
+\r
        // extend jQuery itself if only one argument is passed\r
        if ( length == 1 ) {\r
                target = this;\r
@@ -530,12 +536,12 @@ jQuery.extend = jQuery.fn.extend = function() {
                        // Extend the base object\r
                        for ( var name in options ) {\r
                                // Prevent never-ending loop\r
-                               if ( target == options[ name ] )\r
+                               if ( target === options[ name ] )\r
                                        continue;\r
 \r
                                // Recurse if we're merging object values\r
                                if ( deep && typeof options[ name ] == "object" && target[ name ] && !options[ name ].nodeType )\r
-                                       jQuery.extend( target[ name ], options[ name ] );\r
+                                       target[ name ] = jQuery.extend( target[ name ], options[ name ] );\r
 \r
                                // Don't bring in undefined values\r
                                else if ( options[ name ] != undefined )\r

diff --git a/test/unit/core.js b/test/unit/core.js
index 96b5d4079134fff49c4e5febdded65bcd599d66d..cf3a312db28f5816612b10b9eb34feba79326eaa 100644 (file)
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -811,7 +811,7 @@ test("is(String)", function() {
 });
 
 test("$.extend(Object, Object)", function() {
-       expect(11);
+       expect(14);
 
        var settings = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
                options =     { xnumber2: 1, xstring2: "x", xxx: "newstring" },
@@ -836,6 +836,17 @@ test("$.extend(Object, Object)", function() {
        isObj( deep2.foo, deep2copy.foo, "Check if not deep2: options must not be modified" );
        equals( deep1.foo2, document, "Make sure that a deep clone was not attempted on the document" );
 
+       var target = {};
+       var recursive = { foo:target, bar:5 };
+       jQuery.extend(true, target, recursive);
+       isObj( target, { bar:5 }, "Check to make sure a recursive obj doesn't go never-ending loop by not copying it over" );
+
+       var ret = jQuery.extend(true, { foo: [] }, { foo: [0] } ); // 1907
+       ok( ret.foo.length == 1, "Check to make sure a value with coersion 'false' copies over when necessary to fix #1907" );
+
+       var ret = jQuery.extend(true, { foo: "1,2,3" }, { foo: [1, 2, 3] } );
+       ok( typeof ret.foo != "string", "Check to make sure values equal with coersion (but not actually equal) overwrite correctly" );
+
        var defaults = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
                defaultsCopy = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
                options1 =     { xnumber2: 1, xstring2: "x" },