Moves determineResponse logic into main ajax callback. Puts responseXXX fields defini...
[jquery.git] / src / ajax.js
index 7c0e101..bf0259c 100644 (file)
@@ -1,5 +1,5 @@
 (function( jQuery ) {
-       
+
 var r20 = /%20/g,
        rbracket = /\[\]$/,
        rhash = /#.*$/,
@@ -10,11 +10,12 @@ var r20 = /%20/g,
        rscript = /<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,
        rselectTextarea = /^(?:select|textarea)/i,
        rts = /([?&])_=[^&]*/,
-       rurl = /^(\w+:)?\/\/([^\/?#]+)/,
+       rurl = /^(\w+:)?\/\/([^\/?#:]+)(?::(\d+))?/,
+       rCRLF = /\r?\n/g,
 
        // Slice function
        sliceFunc = Array.prototype.slice,
-       
+
        // Keep a copy of the old load method
        _load = jQuery.fn.load;
 
@@ -60,26 +61,34 @@ jQuery.fn.extend({
                        type: type,
                        dataType: "html",
                        data: params,
-                       complete: function( res, status ) {
+                       // Complete callback (responseText is used internally)
+                       complete: function( jXHR, status, responseText ) {
+                               // Store the response as specified by the jXHR object
+                               responseText = jXHR.responseText;
                                // If successful, inject the HTML into all the matched elements
-                               if ( status === "success" || status === "notmodified" ) {
+                               if ( jXHR.isResolved() ) {
+                                       // #4825: Get the actual response in case
+                                       // a dataFilter is present in ajaxSettings
+                                       jXHR.done(function( r ) {
+                                               responseText = r;
+                                       });
                                        // See if a selector was specified
                                        self.html( selector ?
                                                // Create a dummy div to hold the results
                                                jQuery("<div>")
                                                        // inject the contents of the document in, removing the scripts
                                                        // to avoid any 'Permission Denied' errors in IE
-                                                       .append(res.responseText.replace(rscript, ""))
+                                                       .append(responseText.replace(rscript, ""))
 
                                                        // Locate the specified elements
                                                        .find(selector) :
 
                                                // If not, just inject the full result
-                                               res.responseText );
+                                               responseText );
                                }
 
                                if ( callback ) {
-                                       self.each( callback, [res.responseText, status, res] );
+                                       self.each( callback, [responseText, status, jXHR] );
                                }
                        }
                });
@@ -107,9 +116,9 @@ jQuery.fn.extend({
                                null :
                                jQuery.isArray(val) ?
                                        jQuery.map( val, function(val, i){
-                                               return {name: elem.name, value: val};
+                                               return { name: elem.name, value: val.replace(rCRLF, "\r\n") };
                                        }) :
-                                       {name: elem.name, value: val};
+                                       { name: elem.name, value: val.replace(rCRLF, "\r\n") };
                }).get();
        }
 });
@@ -151,7 +160,10 @@ jQuery.extend({
        },
 
        ajaxSetup: function( settings ) {
-               jQuery.extend( jQuery.ajaxSettings, settings );
+               jQuery.extend( true, jQuery.ajaxSettings, settings );
+               if ( settings.context ) {
+                       jQuery.ajaxSettings.context = settings.context;
+               }
        },
 
        ajaxSettings: {
@@ -165,15 +177,13 @@ jQuery.extend({
                timeout: 0,
                data: null,
                dataType: null,
-               dataTypes: null,
                username: null,
                password: null,
                cache: null,
                traditional: false,
+               headers: {},
+               crossDomain: null,
                */
-               xhr: function() {
-                       return new window.XMLHttpRequest();
-               },
 
                accepts: {
                        xml: "application/xml, text/xml",
@@ -183,12 +193,17 @@ jQuery.extend({
                        "*": "*/*"
                },
 
-               autoDataType: {
+               contents: {
                        xml: /xml/,
                        html: /html/,
                        json: /json/
                },
 
+               responseFields: {
+                       xml: "responseXML",
+                       text: "responseText"
+               },
+
                // Prefilters
                // 1) They are useful to introduce custom dataTypes (see transport/jsonp for an example)
                // 2) These are called:
@@ -208,7 +223,7 @@ jQuery.extend({
                // List of data converters
                // 1) key format is "source_type destination_type" (a single space in-between)
                // 2) the catchall symbol "*" can be used for source_type
-               dataConverters: {
+               converters: {
 
                        // Convert anything to text
                        "* text": window.String,
@@ -224,38 +239,44 @@ jQuery.extend({
                }
        },
 
+       ajaxPrefilter: function( a , b ) {
+               ajaxPrefilterOrTransport( "prefilters" , a , b );
+       },
+
+       ajaxTransport: function( a , b ) {
+               return ajaxPrefilterOrTransport( "transports" , a , b );
+       },
+
        // Main method
-       // (s is used internally)
-       ajax: function( url , options , s ) {
-               
-               // Handle varargs
-               if ( arguments.length === 1 ) {
+       ajax: function( url , options ) {
+
+               // If options is not an object,
+               // we simulate pre-1.5 signature
+               if ( typeof( options ) !== "object" ) {
                        options = url;
-                       url = options ? options.url : undefined;
+                       url = undefined;
                }
-               
+
                // Force options to be an object
                options = options || {};
-               
-               // Get the url if provided separately
-               options.url = url || options.url;
-               
-               // Create the final options object
-               s = jQuery.extend( true , {} , jQuery.ajaxSettings , options );
-               
-               // We force the original context
-               // (plain objects used as context get extended)
-               s.context = options.context;
-               
-               var // jQuery lists
+
+               var // Create the final options object
+                       s = jQuery.extend( true , {} , jQuery.ajaxSettings , options ),
+                       // jQuery lists
                        jQuery_lastModified = jQuery.lastModified,
                        jQuery_etag = jQuery.etag,
                        // Callbacks contexts
-                       callbackContext = s.context || s,
-                       globalEventContext = s.context ? jQuery( s.context ) : jQuery.event,
+                       // 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 ),
                        // Deferreds
                        deferred = jQuery.Deferred(),
                        completeDeferred = jQuery._Deferred(),
+                       // Status-dependent callbacks
+                       statusCode = s.statusCode || {},
                        // Headers (they are sent all at once)
                        requestHeaders = {},
                        // Response headers
@@ -265,15 +286,19 @@ jQuery.extend({
                        transport,
                        // timeout handle
                        timeoutTimer,
+                       // Cross-domain detection vars
+                       loc = document.location,
+                       protocol = loc.protocol || "http:",
+                       parts,
                        // The jXHR state
                        state = 0,
                        // Loop variable
                        i,
                        // Fake xhr
                        jXHR = {
-                               
+
                                readyState: 0,
-                               
+
                                // Caches the header
                                setRequestHeader: function(name,value) {
                                        if ( state === 0 ) {
@@ -281,40 +306,40 @@ jQuery.extend({
                                        }
                                        return this;
                                },
-                               
+
                                // Raw string
                                getAllResponseHeaders: function() {
                                        return state === 2 ? responseHeadersString : null;
                                },
-                               
+
                                // Builds headers hashtable if needed
-                               // (match is used internally)
-                               getResponseHeader: function( key , match ) {
-                                       
-                                       if ( state !== 2 ) {
-                                               return null;
-                                       }
-                                       
-                                       if ( responseHeaders === undefined ) {
-                                               
-                                               responseHeaders = {};
-                                               
-                                               if ( typeof responseHeadersString === "string" ) {
-                                                       
+                               getResponseHeader: function( key ) {
+
+                                       var match;
+
+                                       if ( state === 2 ) {
+
+                                               if ( !responseHeaders ) {
+
+                                                       responseHeaders = {};
+
                                                        while( ( match = rheaders.exec( responseHeadersString ) ) ) {
                                                                responseHeaders[ match[ 1 ].toLowerCase() ] = match[ 2 ];
                                                        }
                                                }
+                                               match = responseHeaders[ key.toLowerCase() ];
+
                                        }
-                                       return responseHeaders[ key.toLowerCase() ];
+
+                                       return match || null;
                                },
-                               
+
                                // Cancel the request
                                abort: function( statusText ) {
-                                       if ( transport && state !== 2 ) {
+                                       if ( transport ) {
                                                transport.abort( statusText || "abort" );
-                                               done( 0 , statusText );
                                        }
+                                       done( 0 , statusText );
                                        return this;
                                }
                        };
@@ -322,16 +347,20 @@ jQuery.extend({
                // Callback for when everything is done
                // It is defined here because jslint complains if it is declared
                // at the end of the function (which would be more logical and readable)
-               function done( status , statusText , response , headers) {
-                       
+               function done( status , statusText , responses , headers) {
+
                        // Called once
                        if ( state === 2 ) {
                                return;
                        }
-                       
+
                        // State is "done" now
                        state = 2;
-                       
+
+                       // Dereference transport for early garbage collection
+                       // (no matter how long the jXHR object will be used)
+                       transport = undefined;
+
                        // Set readyState
                        jXHR.readyState = status ? 4 : 0;
 
@@ -342,35 +371,84 @@ jQuery.extend({
                        if ( timeoutTimer ) {
                                clearTimeout(timeoutTimer);
                        }
-                       
-                       var // Reference url
-                               url = s.url,
-                               // and ifModified status
-                               ifModified = s.ifModified,
-                               
-                               // Is it a success?
-                               isSuccess = 0,
+
+                       var // Reference dataTypes and responseFields
+                               dataTypes = s.dataTypes,
+                               responseFields = s.responseFields,
+                               responseField,
+
+                               // Flag to mark as success
+                               isSuccess,
                                // Stored success
                                success,
                                // Stored error
-                               error = statusText;
-                       
-                       // If not timeout, force a jQuery-compliant status text
-                       if ( statusText != "timeout" ) {
-                               statusText = ( status >= 200 && status < 300 ) ? 
-                                       "success" :
-                                       ( status === 304 ? "notmodified" : "error" );
+                               error,
+
+                               // To keep track of statusCode based callbacks
+                               oldStatusCode,
+
+                               // Actual response
+                               response;
+
+                       // If we got responses:
+                       // - find the right one
+                       // - update dataTypes accordingly
+                       // - set responseXXX accordingly too
+                       if ( responses ) {
+
+                               var contents = s.contents,
+                                       transportDataType = dataTypes[0],
+                                       ct,
+                                       type,
+                                       finalDataType;
+
+                               // Auto (xml, json, script or text determined given headers)
+                               if ( transportDataType === "*" && ( ct = jXHR.getResponseHeader( "content-type" ) ) ) {
+
+                                       for ( type in contents ) {
+                                               if ( contents[ type ] && contents[ type ].test( ct ) ) {
+                                                       transportDataType = dataTypes[0] = type;
+                                                       break;
+                                               }
+                                       }
+
+                                       type = undefined;
+                               }
+
+                               // Get final dataType
+                               for( type in responses ) {
+                                       if ( ! finalDataType && type === transportDataType ) {
+                                               finalDataType = type;
+                                       }
+                                       responseField = responseFields[ type ];
+                                       if ( responseField && ! ( responseField in jXHR ) ) {
+                                               jXHR[ responseField ] = responses[ type ];
+                                       }
+                               }
+
+                               // If no response with the expected dataType was provided
+                               // Take the last response as a default if it exists
+                               if ( ! finalDataType && type ) {
+                                       finalDataType = type;
+                                       if ( transportDataType === "*" ) {
+                                               dataTypes.shift();
+                                       }
+                                       dataTypes.unshift( finalDataType );
+                               }
+
+                               // Get final response
+                               response = responses[ finalDataType ];
                        }
-                       
+
                        // If successful, handle type chaining
-                       if ( statusText === "success" || statusText === "notmodified" ) {
-                               
+                       if ( status >= 200 && status < 300 || status === 304 ) {
+
                                // Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
                                if ( s.ifModified ) {
-                                       
+
                                        var lastModified = jXHR.getResponseHeader("Last-Modified"),
                                                etag = jXHR.getResponseHeader("Etag");
-                                               
+
                                        if (lastModified) {
                                                jQuery_lastModified[ s.url ] = lastModified;
                                        }
@@ -378,108 +456,141 @@ jQuery.extend({
                                                jQuery_etag[ s.url ] = etag;
                                        }
                                }
-                               
-                               if ( s.ifModified && statusText === "notmodified" ) {
-                                       
-                                       success = null;
+
+                               // If not modified
+                               if ( status === 304 ) {
+
+                                       statusText = "notmodified";
                                        isSuccess = 1;
-                                       
+
+                               // If we have data
                                } else {
+
+                                       statusText = "success";
+
                                        // Chain data conversions and determine the final value
                                        // (if an exception is thrown in the process, it'll be notified as an error)
                                        try {
-                                               
+
                                                var i,
+                                                       // Current dataType
                                                        current,
+                                                       // Previous dataType
                                                        prev,
-                                                       checker,
+                                                       // Conversion expression
+                                                       conversion,
+                                                       // Conversion function
+                                                       conv,
+                                                       // Conversion functions (when text is used in-between)
                                                        conv1,
                                                        conv2,
-                                                       oneConv,
-                                                       convertion,
-                                                       dataTypes = s.dataTypes,
-                                                       dataConverters = s.dataConverters,
-                                                       responses = {
-                                                               "xml": "XML",
-                                                               "text": "Text"
-                                                       };
-                                               
+                                                       // Local references to converters
+                                                       converters = s.converters;
+
+                                               // For each dataType in the chain
                                                for( i = 0 ; i < dataTypes.length ; i++ ) {
-                                                       
+
                                                        current = dataTypes[ i ];
-                                                       
-                                                       if ( responses[ current ] ) {
-                                                               jXHR[ "response" + responses[ current ] ] = response;
-                                                               responses[ current ] = 0;
+
+                                                       // If a responseXXX field for this dataType exists
+                                                       // and if it hasn't been set yet
+                                                       responseField = responseFields[ current ];
+                                                       if ( responseField && ! ( responseField in jXHR ) ) {
+                                                               jXHR[ responseField ] = response;
                                                        }
-                                                       
+
+                                                       // If this is not the first element
                                                        if ( i ) {
-                                                               
+
+                                                               // Get the dataType to convert from
                                                                prev = dataTypes[ i - 1 ];
-                                                               
+
+                                                               // If no catch-all and dataTypes are actually different
                                                                if ( prev !== "*" && current !== "*" && prev !== current ) {
-                                                               
-                                                                       oneConv = conv1 = 
-                                                                               dataConverters[ ( conversion = prev + " " + current ) ] ||
-                                                                               dataConverters[ "* " + current ];
-                                                                       
-                                                                       if ( oneConv !== true ) {
-                                                                               
-                                                                               if ( ! oneConv && prev !== "text" && current !== "text" ) {
-                                                                                       conv1 = dataConverters[ prev + " text" ] || dataConverters[ "* text" ];
-                                                                                       conv2 = dataConverters[ "text " + current ];
-                                                                               }
-                                                                               
-                                                                               if ( oneConv || conv1 && conv2 ) {
-                                                                                       response = oneConv ? conv1( response ) : conv2( conv1( response ) );
-                                                                               } else {
-                                                                                       throw "no " + conversion;
+
+                                                                       // Get the converter
+                                                                       conversion = prev + " " + current;
+                                                                       conv = converters[ conversion ] || converters[ "* " + current ];
+
+                                                                       conv1 = conv2 = 0;
+
+                                                                       // If there is no direct converter and none of the dataTypes is text
+                                                                       if ( ! conv && prev !== "text" && current !== "text" ) {
+                                                                               // Try with text in-between
+                                                                               conv1 = converters[ prev + " text" ] || converters[ "* text" ];
+                                                                               conv2 = converters[ "text " + current ];
+                                                                               // Revert back to a single converter
+                                                                               // if one of the converter is an equivalence
+                                                                               if ( conv1 === true ) {
+                                                                                       conv = conv2;
+                                                                               } else if ( conv2 === true ) {
+                                                                                       conv = conv1;
                                                                                }
                                                                        }
+                                                                       // If we found no converter, dispatch an error
+                                                                       if ( ! ( conv || conv1 && conv2 ) ) {
+                                                                               throw conversion;
+                                                                       }
+                                                                       // If found converter is not an equivalence
+                                                                       if ( conv !== true ) {
+                                                                               // Convert with 1 or 2 converters accordingly
+                                                                               response = conv ? conv( response ) : conv2( conv1( response ) );
+                                                                       }
                                                                }
+                                                       // If it is the first element of the chain
+                                                       // and we have a dataFilter
                                                        } else if ( s.dataFilter ) {
-                                                               
-                                                               response = s.dataFilter( response );
+                                                               // Apply the dataFilter
+                                                               response = s.dataFilter( response , current );
+                                                               // Get dataTypes again in case the filter changed them
                                                                dataTypes = s.dataTypes;
                                                        }
                                                }
-               
+                                               // End of loop
+
                                                // We have a real success
                                                success = response;
                                                isSuccess = 1;
-                                               
+
+                                       // If an exception was thrown
                                        } catch(e) {
-                                               
+
+                                               // We have a parsererror
                                                statusText = "parsererror";
                                                error = "" + e;
-                                               
+
                                        }
                                }
-                               
-                       } else { // if not success, mark it as an error
-                               
-                                       error = error || statusText;
+
+                       // if not success, mark it as an error
+                       } else {
+                                       error = statusText = statusText || "error";
                        }
-                               
+
                        // Set data for the fake xhr object
                        jXHR.status = status;
                        jXHR.statusText = statusText;
-                       
+
                        // Success/Error
                        if ( isSuccess ) {
-                               deferred.fire( callbackContext , [ success , statusText , jXHR ] );
+                               deferred.resolveWith( callbackContext , [ success , statusText , jXHR ] );
                        } else {
-                               deferred.fireReject( callbackContext , [ jXHR , statusText , error ] );
+                               deferred.rejectWith( callbackContext , [ jXHR , statusText , error ] );
                        }
-                       
+
+                       // Status-dependent callbacks
+                       oldStatusCode = statusCode;
+                       statusCode = undefined;
+                       jXHR.statusCode( oldStatusCode );
+
                        if ( s.global ) {
                                globalEventContext.trigger( "ajax" + ( isSuccess ? "Success" : "Error" ) ,
                                                [ jXHR , s , isSuccess ? success : error ] );
                        }
-                       
+
                        // Complete
-                       completeDeferred.fire( callbackContext, [ jXHR , statusText ] );
-                       
+                       completeDeferred.resolveWith( callbackContext, [ jXHR , statusText ] );
+
                        if ( s.global ) {
                                globalEventContext.trigger( "ajaxComplete" , [ jXHR , s] );
                                // Handle the global AJAX counter
@@ -488,125 +599,153 @@ jQuery.extend({
                                }
                        }
                }
-               
-               // Attach deferreds     
-               jXHR.success = jXHR.then = deferred.then;
-               jXHR.error = jXHR.fail = deferred.fail;
-               jXHR.complete = completeDeferred.then;
+
+               // Attach deferreds
+               deferred.promise( jXHR );
+               jXHR.success = jXHR.done;
+               jXHR.error = jXHR.fail;
+               jXHR.complete = completeDeferred.done;
+
+               // Status-dependent callbacks
+               jXHR.statusCode = function( map ) {
+                       if ( map ) {
+                               var tmp;
+                               if ( statusCode ) {
+                                       for( tmp in map ) {
+                                               statusCode[ tmp ] = [ statusCode[ tmp ] , map[ tmp ] ];
+                                       }
+                               } else {
+                                       tmp = map[ jXHR.status ];
+                                       jXHR.done( tmp ).fail( tmp );
+                               }
+                       }
+                       return this;
+               };
 
                // Remove hash character (#7531: and string promotion)
-               s.url = ( "" + s.url ).replace( rhash , "" );
-               
-               // Uppercase the type
-               s.type = s.type.toUpperCase();
-               
-               // Determine if request has content
-               s.hasContent = ! rnoContent.test( s.type );
-               
+               // We also use the url parameter if available
+               s.url = ( "" + ( url || s.url ) ).replace( rhash , "" );
+
                // Extract dataTypes list
                s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().split( /\s+/ );
-               
+
                // Determine if a cross-domain request is in order
-               var parts = rurl.exec( s.url.toLowerCase() ),
-                       loc = location;
-               s.crossDomain = !!( parts && ( parts[ 1 ] && parts[ 1 ] != loc.protocol || parts[ 2 ] != loc.host ) );
+               if ( ! s.crossDomain ) {
+                       parts = rurl.exec( s.url.toLowerCase() );
+                       s.crossDomain = !!(
+                                       parts &&
+                                       ( parts[ 1 ] && parts[ 1 ] != protocol ||
+                                               parts[ 2 ] != loc.hostname ||
+                                               ( parts[ 3 ] || ( ( parts[ 1 ] || protocol ) === "http:" ? 80 : 443 ) ) !=
+                                                       ( loc.port || ( protocol === "http:" ? 80 : 443 ) ) )
+                       );
+               }
 
                // Convert data if not already a string
-               if ( s.data && s.processData && typeof s.data != "string" ) {
+               if ( s.data && s.processData && typeof s.data !== "string" ) {
                        s.data = jQuery.param( s.data , s.traditional );
                }
 
+               // Apply prefilters
+               jQuery.ajaxPrefilter( s , options );
+
+               // Uppercase the type
+               s.type = s.type.toUpperCase();
+
+               // Determine if request has content
+               s.hasContent = ! rnoContent.test( s.type );
+
                // Watch for a new set of requests
                if ( s.global && jQuery.active++ === 0 ) {
                        jQuery.event.trigger( "ajaxStart" );
                }
-               
-               // Get transport
-               transport = jQuery.ajax.prefilter( s ).transport( s );
-               
-               // If no transport, we auto-abort
-               if ( ! transport ) {
-                       
-                       done( 0 , "transport not found" );
-                       jXHR = false;
-                       
-               } else {
-                       
-                       // More options handling for requests with no content
-                       if ( ! s.hasContent ) {
-                               
-                               // If data is available, append data to url
-                               if ( s.data ) {
-                                       s.url += ( rquery.test( s.url ) ? "&" : "?" ) + s.data;
-                               }
-                                                               
-                               // Add anti-cache in url if needed
-                               if ( s.cache === false ) {
-                                       
-                                       var ts = jQuery.now(),
-                                               // try replacing _= if it is there
-                                               ret = s.url.replace( rts , "$1_=" + ts );
-                                               
-                                       // if nothing was replaced, add timestamp to the end
-                                       s.url = ret + ( (ret == s.url ) ? ( rquery.test( s.url ) ? "&" : "?" ) + "_=" + ts : "");
-                               }
+
+               // More options handling for requests with no content
+               if ( ! s.hasContent ) {
+
+                       // If data is available, append data to url
+                       if ( s.data ) {
+                               s.url += ( rquery.test( s.url ) ? "&" : "?" ) + s.data;
                        }
-                       
-                       // Set the correct header, if data is being sent
-                       if ( ( s.data && s.hasContent ) || options.contentType ) {
-                               requestHeaders[ "content-type" ] = s.contentType;
+
+                       // Add anti-cache in url if needed
+                       if ( s.cache === false ) {
+
+                               var ts = jQuery.now(),
+                                       // try replacing _= if it is there
+                                       ret = s.url.replace( rts , "$1_=" + ts );
+
+                               // if nothing was replaced, add timestamp to the end
+                               s.url = ret + ( (ret == s.url ) ? ( rquery.test( s.url ) ? "&" : "?" ) + "_=" + ts : "");
                        }
-               
-                       // Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
-                       if ( s.ifModified ) {
-                               if ( jQuery_lastModified[ s.url ] ) { 
-                                       requestHeaders[ "if-modified-since" ] = jQuery_lastModified[ s.url ];
-                               }
-                               if ( jQuery_etag[ s.url ] ) {
-                                       requestHeaders[ "if-none-match" ] = jQuery_etag[ s.url ];
-                               }
+               }
+
+               // Set the correct header, if data is being sent
+               if ( s.data && s.hasContent && s.contentType !== false || options.contentType ) {
+                       requestHeaders[ "content-type" ] = s.contentType;
+               }
+
+               // Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
+               if ( s.ifModified ) {
+                       if ( jQuery_lastModified[ s.url ] ) {
+                               requestHeaders[ "if-modified-since" ] = jQuery_lastModified[ s.url ];
                        }
-               
-                       // Set the Accepts header for the server, depending on the dataType
-                       requestHeaders.accept = s.dataTypes[ 0 ] && s.accepts[ s.dataTypes[ 0 ] ] ?
-                               s.accepts[ s.dataTypes[ 0 ] ] + ( s.dataTypes[ 0 ] !== "*" ? ", */*; q=0.01" : "" ) :
-                               s.accepts[ "*" ];
-                               
-                       // Check for headers option
-                       for ( i in s.headers ) {
-                               requestHeaders[ i.toLowerCase() ] = s.headers[ i ];
+                       if ( jQuery_etag[ s.url ] ) {
+                               requestHeaders[ "if-none-match" ] = jQuery_etag[ s.url ];
+                       }
+               }
+
+               // Set the Accepts header for the server, depending on the dataType
+               requestHeaders.accept = s.dataTypes[ 0 ] && s.accepts[ s.dataTypes[ 0 ] ] ?
+                       s.accepts[ s.dataTypes[ 0 ] ] + ( s.dataTypes[ 0 ] !== "*" ? ", */*; q=0.01" : "" ) :
+                       s.accepts[ "*" ];
+
+               // Check for headers option
+               for ( i in s.headers ) {
+                       requestHeaders[ i.toLowerCase() ] = s.headers[ i ];
+               }
+
+               // Allow custom headers/mimetypes and early abort
+               if ( s.beforeSend && ( s.beforeSend.call( callbackContext , jXHR , s ) === false || state === 2 ) ) {
+
+                               // Abort if not done already
+                               done( 0 , "abort" );
+
+                               // Return false
+                               jXHR = false;
+
+               } else {
+
+                       // Install callbacks on deferreds
+                       for ( i in { success:1, error:1, complete:1 } ) {
+                               jXHR[ i ]( s[ i ] );
                        }
-                       
-                       // Allow custom headers/mimetypes and early abort
-                       if ( s.beforeSend && ( s.beforeSend.call( callbackContext , jXHR , s ) === false || state === 2 ) ) {
-                                       
-                                       // Abort if not done already
-                                       done( 0 , "abort" );
-                                       jXHR = false;
-                                       
+
+                       // Get transport
+                       transport = jQuery.ajaxTransport( s , options );
+
+                       // If no transport, we auto-abort
+                       if ( ! transport ) {
+
+                               done( 0 , "notransport" );
+
                        } else {
-                               
+
                                // Set state as sending
-                               state = 1;
-                               jXHR.readyState = 1;
-                               
-                               // Install callbacks on deferreds
-                               for ( i in { success:1, error:1, complete:1 } ) {
-                                       jXHR[ i ]( s[ i ] );
-                               }
-                               
+                               state = jXHR.readyState = 1;
+
                                // Send global event
                                if ( s.global ) {
                                        globalEventContext.trigger( "ajaxSend" , [ jXHR , s ] );
                                }
-                               
+
                                // Timeout
                                if ( s.async && s.timeout > 0 ) {
                                        timeoutTimer = setTimeout(function(){
                                                jXHR.abort( "timeout" );
                                        }, s.timeout);
                                }
-                               
+
                                // Try to send
                                try {
                                        transport.send(requestHeaders, done);
@@ -616,7 +755,7 @@ jQuery.extend({
 
                                                done(0, "error", "" + e);
                                                jXHR = false;
-                                               
+
                                        // Simply rethrow otherwise
                                        } else {
                                                jQuery.error(e);
@@ -624,7 +763,7 @@ jQuery.extend({
                                }
                        }
                }
-               
+
                return jXHR;
        },
 
@@ -715,199 +854,97 @@ jQuery.extend({
 
 });
 
-//Execute or select from functions in a given structure of options
-function ajax_selectOrExecute( structure , s ) {
+// Base function for both ajaxPrefilter and ajaxTransport
+function ajaxPrefilterOrTransport( arg0 , arg1 , arg2 ) {
 
-       var dataTypes = s.dataTypes,
-               transportDataType,
-               list,
-               selected,
+       var type = jQuery.type( arg1 ),
+               structure = jQuery.ajaxSettings[ arg0 ],
                i,
-               length,
-               checked = {},
-               flag,
-               noSelect = structure !== "transports";
-               
-       function initSearch( dataType ) {
-
-               flag = transportDataType !== dataType && ! checked[ dataType ];
-               
-               if ( flag ) {
-                       
-                       checked[ dataType ] = 1;
-                       transportDataType = dataType;
-                       list = s[ structure ][ dataType ];
-                       i = -1;
-                       length = list ? list.length : 0 ;
-               }
+               length;
+
+       // We have an options map so we have to inspect the structure
+       if ( type === "object" ) {
+
+               var options = arg1,
+                       originalOptions = arg2,
+                       // When dealing with prefilters, we execute only
+                       // (no selection so we never stop when a function
+                       // returns a non-falsy, non-string value)
+                       executeOnly = ( arg0 === "prefilters" ),
+                       inspect = function( dataType, tested ) {
+
+                               if ( ! tested[ dataType ] ) {
+
+                                       tested[ dataType ] = true;
+
+                                       var list = structure[ dataType ],
+                                               selected;
+
+                                       for( i = 0, length = list ? list.length : 0 ; ( executeOnly || ! selected ) && i < length ; i++ ) {
+                                               selected = list[ i ]( options , originalOptions );
+                                               // If we got redirected to a different dataType,
+                                               // we add it and switch to the corresponding list
+                                               if ( typeof( selected ) === "string" && selected !== dataType ) {
+                                                       options.dataTypes.unshift( selected );
+                                                       selected = inspect( selected , tested );
+                                                       // We always break in order not to continue
+                                                       // to iterate in previous list
+                                                       break;
+                                               }
+                                       }
+                                       // If we're only executing or nothing was selected
+                                       // we try the catchall dataType
+                                       if ( executeOnly || ! selected ) {
+                                               selected = inspect( "*" , tested );
+                                       }
+                                       // This will be ignored by ajaxPrefilter
+                                       // so it's safe to return no matter what
+                                       return selected;
+                               }
 
-               return flag;
-       }
-       
-       initSearch( dataTypes[ 0 ] );
-
-       for ( i = 0 ; ( noSelect || ! selected ) && i <= length ; i++ ) {
-               
-               if ( i === length ) {
-                       
-                       initSearch( "*" );
-                       
-               } else {
+                       };
+
+               // Start inspection with current transport dataType
+               return inspect( options.dataTypes[ 0 ] , {} );
 
-                       selected = list[ i ]( s , determineDataType );
+       } else {
 
-                       // If we got redirected to another dataType
-                       // Search there (if not in progress or already tried)
-                       if ( typeof( selected ) === "string" &&
-                               initSearch( selected ) ) {
+               // We're requested to add to the structure
+               // Signature is ( dataTypeExpression , function )
+               // with dataTypeExpression being optional and
+               // defaulting to catchAll (*)
+               type = type === "function";
 
-                               dataTypes.unshift( selected );
-                               selected = 0;
-                       }
+               if ( type ) {
+                       arg2 = arg1;
+                       arg1 = undefined;
                }
-       }
+               arg1 = arg1 || "*";
 
-       return noSelect ? jQuery.ajax : selected;
-}
+               // We control that the second argument is really a function
+               if ( type || jQuery.isFunction( arg2 ) ) {
 
-// Add an element to one of the structures in ajaxSettings
-function ajax_addElement( structure , args ) {
-               
-       var i,
-               start = 0,
-               length = args.length,
-               dataTypes = [ "*" ],
-               dLength = 1,
-               dataType,
-               functors = [],
-               first,
-               append,
-               list;
-               
-       if ( length ) {
-               
-               first = jQuery.type( args[ 0 ] );
-               
-               if ( first === "object" ) {
-                       return ajax_selectOrExecute( structure , args[ 0 ] );
-               }
-               
-               structure = jQuery.ajaxSettings[ structure ];
-               
-               if ( first !== "function" ) {
-                       
-                       dataTypes = args[ 0 ].toLowerCase().split(/\s+/);
-                       dLength = dataTypes.length;
-                       start = 1;
-                       
-               }
-               
-               if ( dLength && start < length ) {
-                       
-                       functors = sliceFunc.call( args , start );
-                                       
-                       for( i = 0 ; i < dLength ; i++ ) {
-                               
+                       var dataTypes = arg1.split( /\s+/ ),
+                               functor = arg2,
+                               dataType,
+                               list,
+                               placeBefore;
+
+                       // For each dataType in the dataTypeExpression
+                       for( i = 0 , length = dataTypes.length ; i < length ; i++ ) {
                                dataType = dataTypes[ i ];
-                               
-                               first = /^\+/.test( dataType );
-                               
-                               if (first) {
-                                       dataType = dataType.substr(1);
-                               }
-                               
-                               if ( dataType !== "" ) {
-                               
-                                       append = Array.prototype[ first ? "unshift" : "push" ];
-                                       list = structure[ dataType ] = structure[ dataType ] || [];
-                                       append.apply( list , functors );
+                               // We control if we're asked to add before
+                               // any existing element
+                               placeBefore = /^\+/.test( dataType );
+                               if ( placeBefore ) {
+                                       dataType = dataType.substr( 1 );
                                }
+                               list = structure[ dataType ] = structure[ dataType ] || [];
+                               // then we add to the structure accordingly
+                               list[ placeBefore ? "unshift" : "push" ]( functor );
                        }
                }
        }
-       
-       return jQuery.ajax;
 }
 
-// Install prefilter & transport methods
-jQuery.each( [ "prefilter" , "transport" ] , function( _ , name ) {
-       _ = name + "s";
-       jQuery.ajax[ name ] = function() {
-               return ajax_addElement( _ , arguments );
-       };
-} );
-       
-// Utility function that handles dataType when response is received
-// (for those transports that can give text or xml responses)
-function determineDataType( s , ct , text , xml ) {
-       
-       var autoDataType = s.autoDataType,
-               type,
-               regexp,
-               dataTypes = s.dataTypes,
-               transportDataType = dataTypes[0],
-               response;
-       
-       // Auto (xml, json, script or text determined given headers)
-       if ( transportDataType === "*" ) {
-
-               for ( type in autoDataType ) {
-                       if ( ( regexp = autoDataType[ type ] ) && regexp.test( ct ) ) {
-                               transportDataType = dataTypes[0] = type;
-                               break;
-                       }
-               }                       
-       } 
-       
-       // xml and parsed as such
-       if ( transportDataType === "xml" &&
-               xml &&
-               xml.documentElement /* #4958 */ ) {
-               
-               response = xml;
-       
-       // Text response was provided
-       } else {
-               
-               response = text;
-               
-               // If it's not really text, defer to dataConverters
-               if ( transportDataType !== "text" ) {
-                       dataTypes.unshift( "text" );
-               }
-               
-       }
-       
-       return response;
-}      
-
-/*
- * Create the request object; Microsoft failed to properly
- * implement the XMLHttpRequest in IE7 (can't request local files),
- * so we use the ActiveXObject when it is available
- * Additionally XMLHttpRequest can be disabled in IE7/IE8 so
- * we need a fallback.
- */
-if ( window.ActiveXObject ) {
-       jQuery.ajaxSettings.xhr = function() {
-       if ( window.location.protocol !== "file:" ) {
-               try {
-                       return new window.XMLHttpRequest();
-               } catch( xhrError ) {}
-       }
-
-       try {
-               return new window.ActiveXObject("Microsoft.XMLHTTP");
-       } catch( activeError ) {}
-       };
-}
-
-var testXHR = jQuery.ajaxSettings.xhr();
-
-// Does this browser support XHR requests?
-jQuery.support.ajax = !!testXHR;
-
-// Does this browser support crossDomain XHR requests
-jQuery.support.cors = testXHR && "withCredentials" in testXHR;
-
 })( jQuery );