Makes sure all converters keys are lowercased before any conversion is taking place...

[jquery.git] / src / ajax.js

diff --git a/src/ajax.js b/src/ajax.js
index caacb60..39abe90 100644 (file)
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -48,7 +48,7 @@ function addToPrefiltersOrTransports( structure ) {
                }
 
                if ( jQuery.isFunction( func ) ) {
-                       var dataTypes = dataTypeExpression.split( rspacesAjax ),
+                       var dataTypes = dataTypeExpression.toLowerCase().split( rspacesAjax ),
                                i = 0,
                                length = dataTypes.length,
                                dataType,
@@ -62,7 +62,7 @@ function addToPrefiltersOrTransports( structure ) {
                                // any existing element
                                placeBefore = /^\+/.test( dataType );
                                if ( placeBefore ) {
-                                       dataType = dataType.substr( 1 );
+                                       dataType = dataType.substr( 1 ) || "*";
                                }
                                list = structure[ dataType ] = structure[ dataType ] || [];
                                // then we add to the structure accordingly
@@ -73,7 +73,7 @@ function addToPrefiltersOrTransports( structure ) {
 }
 
 //Base inspection function for prefilters and transports
-function inspectPrefiltersOrTransports( structure, options, originalOptions,
+function inspectPrefiltersOrTransports( structure, options, originalOptions, jXHR,
                dataType /* internal */, inspected /* internal */ ) {
 
        dataType = dataType || options.dataTypes[ 0 ];
@@ -88,7 +88,7 @@ function inspectPrefiltersOrTransports( structure, options, originalOptions,
                selection;
 
        for(; i < length && ( executeOnly || !selection ); i++ ) {
-               selection = list[ i ]( options, originalOptions );
+               selection = list[ i ]( options, originalOptions, jXHR );
                // If we got redirected to another dataType
                // we try there if not done already
                if ( typeof selection === "string" ) {
@@ -97,7 +97,7 @@ function inspectPrefiltersOrTransports( structure, options, originalOptions,
                        } else {
                                options.dataTypes.unshift( selection );
                                selection = inspectPrefiltersOrTransports(
-                                               structure, options, originalOptions, selection, inspected );
+                                               structure, options, originalOptions, jXHR, selection, inspected );
                        }
                }
        }
@@ -105,7 +105,7 @@ function inspectPrefiltersOrTransports( structure, options, originalOptions,
        // we try the catchall dataType if not done already
        if ( ( executeOnly || !selection ) && !inspected[ "*" ] ) {
                selection = inspectPrefiltersOrTransports(
-                               structure, options, originalOptions, "*", inspected );
+                               structure, options, originalOptions, jXHR, "*", inspected );
        }
        // unnecessary when only executing (prefilters)
        // but it'll be ignored by the caller in that case
@@ -334,13 +334,17 @@ jQuery.extend({
 
                var // Create the final options object
                        s = jQuery.extend( true, {}, jQuery.ajaxSettings, options ),
-                       // Callbacks contexts
+                       // 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,
-                       globalEventContext = callbackContext === s ? jQuery.event : jQuery( callbackContext ),
+                       // Context for global events
+                       // It's the callbackContext if one was provided in the options
+                       // and if it's a DOM node
+                       globalEventContext = callbackContext !== s && callbackContext.nodeType ?
+                               jQuery( callbackContext ) : jQuery.event,
                        // Deferreds
                        deferred = jQuery.Deferred(),
                        completeDeferred = jQuery._Deferred(),
@@ -472,7 +476,7 @@ jQuery.extend({
                                        } catch(e) {
                                                // We have a parsererror
                                                statusText = "parsererror";
-                                               error = "" + e;
+                                               error = e;
                                        }
                                }
                        } else {
@@ -565,7 +569,7 @@ jQuery.extend({
                }
 
                // Apply prefilters
-               inspectPrefiltersOrTransports( prefilters, s, options );
+               inspectPrefiltersOrTransports( prefilters, s, options, jXHR );
 
                // Uppercase the type
                s.type = s.type.toUpperCase();
@@ -638,7 +642,7 @@ jQuery.extend({
                        }
 
                        // Get transport
-                       transport = inspectPrefiltersOrTransports( transports, s, options );
+                       transport = inspectPrefiltersOrTransports( transports, s, options, jXHR );
 
                        // If no transport, we auto-abort
                        if ( !transport ) {
@@ -662,7 +666,7 @@ jQuery.extend({
                                } catch (e) {
                                        // Propagate exception as error if not done
                                        if ( status < 2 ) {
-                                               done( -1, "" + e );
+                                               done( -1, e );
                                        // Simply rethrow otherwise
                                        } else {
                                                jQuery.error( e );
@@ -736,9 +740,9 @@ function buildParams( prefix, obj, traditional, add ) {
 
                // Serialize object item.
                } else {
-                       jQuery.each( obj, function( k, v ) {
-                               buildParams( prefix + "[" + k + "]", v, traditional, add );
-                       });
+                       for ( var name in obj ) {
+                               buildParams( prefix + "[" + name + "]", obj[ name ], traditional, add );
+                       }
                }
 
        } else {
@@ -838,8 +842,9 @@ function ajaxConvert( s, response ) {
        }
 
        var dataTypes = s.dataTypes,
-               converters = s.converters,
+               converters = {},
                i,
+               key,
                length = dataTypes.length,
                tmp,
                // Current and previous dataTypes
@@ -849,13 +854,23 @@ function ajaxConvert( s, response ) {
                conversion,
                // Conversion function
                conv,
-               // Conversion functions (when text is used in-between)
+               // Conversion functions (transitive conversion)
                conv1,
                conv2;
 
        // For each dataType in the chain
        for( i = 1; i < length; i++ ) {
 
+               // Create converters map
+               // with lowercased keys
+               if ( i === 1 ) {
+                       for( key in s.converters ) {
+                               if( typeof key === "string" ) {
+                                       converters[ key.toLowerCase() ] = s.converters[ key ];
+                               }
+                       }
+               }
+
                // Get the dataTypes
                prev = current;
                current = dataTypes[ i ];