X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fajax.js;h=d8af9387451139393745df54c7b843c43e2cd557;hb=7d75ea950ea31a6734dc42e2037742b0c6719e8a;hp=a6ee676d4cf7e4f34fa2f0ab29f64ab63b99d9d9;hpb=0e5b341cc0f3f9bf0f6659e09704f2267cfdfdba;p=jquery.git diff --git a/src/ajax.js b/src/ajax.js index a6ee676..d8af938 100644 --- a/src/ajax.js +++ b/src/ajax.js @@ -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 @@ -542,7 +542,7 @@ jQuery.extend({ }; // Remove hash character (#7531: and string promotion) - // Add protocol if not provided (#5856: IE7 issue with protocol-less urls) + // 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, protocol + "//" ); @@ -565,7 +565,7 @@ jQuery.extend({ } // Apply prefilters - inspectPrefiltersOrTransports( prefilters, s, options ); + inspectPrefiltersOrTransports( prefilters, s, options, jXHR ); // Uppercase the type s.type = s.type.toUpperCase(); @@ -638,7 +638,7 @@ jQuery.extend({ } // Get transport - transport = inspectPrefiltersOrTransports( transports, s, options ); + transport = inspectPrefiltersOrTransports( transports, s, options, jXHR ); // If no transport, we auto-abort if ( !transport ) {