Enhances ajaxSetup so that it can take an optional target option, in which case targe...

diff --git a/src/ajax.js b/src/ajax.js
index e6c9ac8a5aeed664d4fd8223e7e9ce69a3d790b5..7ef8dec186669fc26a759b44f55e7036f03ae466 100644 (file)
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -279,11 +279,27 @@ jQuery.extend({
                return jQuery.get( url, data, callback, "json" );
        },
 
-       ajaxSetup: function( settings ) {
-               jQuery.extend( true, jQuery.ajaxSettings, settings );
-               if ( settings.context ) {
-                       jQuery.ajaxSettings.context = settings.context;
+       // Creates a full fledged settings object into target
+       // with both ajaxSettings and settings fields.
+       // If target is omitted, writes into ajaxSettings.
+       ajaxSetup: function ( target, settings ) {
+               if ( !settings ) {
+                       // Only one parameter, we extend ajaxSettings
+                       settings = target;
+                       target = jQuery.extend( true, jQuery.ajaxSettings, settings );
+               } else {
+                       // target was provided, we extend into it
+                       jQuery.extend( true, target, jQuery.ajaxSettings, settings );
+               }
+               // Flatten fields we don't want deep extended
+               for( var field in { context: 1, url: 1 } ) {
+                       if ( field in settings ) {
+                               target[ field ] = settings[ field ];
+                       } else if( field in jQuery.ajaxSettings ) {
+                               target[ field ] = jQuery.ajaxSettings[ field ];
+                       }
                }
+               return target;
        },
 
        ajaxSettings: {
@@ -360,13 +376,9 @@ jQuery.extend({
                options = options || {};
 
                var // Create the final options object
-                       s = jQuery.extend( true, {}, jQuery.ajaxSettings, options ),
+                       s = jQuery.ajaxSetup( {}, options ),
                        // Callbacks context
-                       // We force the original context if it exists
-                       // or take it from jQuery.ajaxSettings otherwise
-                       // (plain objects used as context get extended)
-                       callbackContext =
-                               ( s.context = ( "context" in options ? options : jQuery.ajaxSettings ).context ) || s,
+                       callbackContext = s.context || s,
                        // Context for global events
                        // It's the callbackContext if one was provided in the options
                        // and if it's a DOM node or a jQuery collection
@@ -586,7 +598,7 @@ jQuery.extend({
                // Remove hash character (#7531: and string promotion)
                // Add protocol if not provided (#5866: IE7 issue with protocol-less urls)
                // We also use the url parameter if available
-               s.url = ( "" + ( url || s.url ) ).replace( rhash, "" ).replace( rprotocol, ajaxLocParts[ 1 ] + "//" );
+               s.url = ( ( url || s.url ) + "" ).replace( rhash, "" ).replace( rprotocol, ajaxLocParts[ 1 ] + "//" );
 
                // Extract dataTypes list
                s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().split( rspacesAjax );