Make deep .extend() an optional argument - it will go deep if you pass in an boolean...

diff --git a/src/ajax/ajax.js b/src/ajax/ajax.js
index 4f0b2e8fdd44e3abc38b3c07d19628cd620528f2..d9b3a3d8b4d01d808cac67a9a6d81026606610e3 100644 (file)
--- a/src/ajax/ajax.js
+++ b/src/ajax/ajax.js
@@ -434,7 +434,7 @@ jQuery.extend({
         * @cat Ajax
         */
        ajaxSetup: function( settings ) {
-               jQuery.extend( jQuery.ajaxSettings, settings );
+               jQuery.extend( true, jQuery.ajaxSettings, settings );
        },
 
        ajaxSettings: {
@@ -575,7 +575,7 @@ jQuery.extend({
        ajax: function( s ) {
                // Extend the settings, but re-extend 's' so that it can be
                // checked again later (in the test suite, specifically)
-               s = jQuery.extend(s, jQuery.extend({}, jQuery.ajaxSettings, s));
+               s = jQuery.extend(true, s, jQuery.extend(true, {}, jQuery.ajaxSettings, s));
 
                // if data available
                if ( s.data ) {

diff --git a/src/jquery/coreTest.js b/src/jquery/coreTest.js
index ff8909c8ba47c4e0845050ab1531ae9d9f53283e..312bc3ce15b6aa8e8bf668c7d85e363f2334262e 100644 (file)
--- a/src/jquery/coreTest.js
+++ b/src/jquery/coreTest.js
@@ -680,7 +680,7 @@ test("$.extend(Object, Object)", function() {
        isObj( settings, merged, "Check if extended: settings must be extended" );
        isObj( options, optionsCopy, "Check if not modified: options must not be modified" );
 
-       jQuery.extend(deep1, deep2);
+       jQuery.extend(true, deep1, deep2);
        isObj( deep1.foo, deepmerged.foo, "Check if foo: settings must be extended" );
        isObj( deep2.foo, deep2copy.foo, "Check if not deep2: options must not be modified" );
 

diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js
index 797280e073759b663dbc38da8c92405199063f5e..a79b2e6b2f83c6f3af48a8c3aefedfc5d66c9d5c 100644 (file)
--- a/src/jquery/jquery.js
+++ b/src/jquery/jquery.js
@@ -1256,7 +1256,13 @@ jQuery.fn = jQuery.prototype = {
  */
 jQuery.extend = jQuery.fn.extend = function() {
        // copy reference to target object
-       var target = arguments[0] || {}, a = 1, al = arguments.length;
+       var target = arguments[0] || {}, a = 1, al = arguments.length, deep = false;
+
+       // Handle a deep copy situation
+       if ( target.constructor == Boolean ) {
+               deep = true;
+               target = arguments[1] || {};
+       }
 
        // extend jQuery itself if only one argument is passed
        if ( al == 1 ) {
@@ -1276,7 +1282,7 @@ jQuery.extend = jQuery.fn.extend = function() {
                                        continue;
 
                                // Recurse if we're merging object values
-                               if ( typeof prop[i] == 'object' && target[i] )
+                               if ( deep && typeof prop[i] == 'object' && target[i] )
                                        jQuery.extend( target[i], prop[i] );
 
                                // Don't bring in undefined values