X-Git-Url: http://git.asbjorn.biz/?p=jquery.git;a=blobdiff_plain;f=src%2Fajax.js;h=2d20040a932cac766ed60d84be17635d2724cf5f;hp=187236576c439ab4da409eefe7a21e35042ff7aa;hb=e3cc440934fcb03bfeb10fb6281615409ad6f483;hpb=dc2e7317a90464e729fd9f29afaa16fa9c01487c diff --git a/src/ajax.js b/src/ajax.js index 1872365..2d20040 100644 --- a/src/ajax.js +++ b/src/ajax.js @@ -2,22 +2,130 @@ var r20 = /%20/g, rbracket = /\[\]$/, + rCRLF = /\r?\n/g, rhash = /#.*$/, rheaders = /^(.*?):\s*(.*?)\r?$/mg, // IE leaves an \r character at EOL rinput = /^(?:color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i, rnoContent = /^(?:GET|HEAD)$/, + rprotocol = /^\/\//, rquery = /\?/, rscript = /)<[^<]*)*<\/script>/gi, rselectTextarea = /^(?:select|textarea)/i, + rspacesAjax = /\s+/, rts = /([?&])_=[^&]*/, - rurl = /^(\w+:)?\/\/([^\/?#:]+)(?::(\d+))?/, - rCRLF = /\r?\n/g, - - // Slice function - sliceFunc = Array.prototype.slice, + rurl = /^(\w+:)\/\/([^\/?#:]+)(?::(\d+))?/, // Keep a copy of the old load method - _load = jQuery.fn.load; + _load = jQuery.fn.load, + + /* Prefilters + * 1) They are useful to introduce custom dataTypes (see ajax/jsonp.js for an example) + * 2) These are called: + * - BEFORE asking for a transport + * - AFTER param serialization (s.data is a string if s.processData is true) + * 3) key is the dataType + * 4) the catchall symbol "*" can be used + * 5) execution will start with transport dataType and THEN continue down to "*" if needed + */ + prefilters = {}, + + /* Transports bindings + * 1) key is the dataType + * 2) the catchall symbol "*" can be used + * 3) selection will start with transport dataType and THEN go to "*" if needed + */ + transports = {}, + + // Stored document location array + ajaxLocation; + +// #8138, IE may throw an exception when accessing +// a field from document.location if document.domain has been set +try { + ajaxLocation = document.location.href; +} catch( e ) { + // Use the href attribute of an A element + // since IE will modify it given document.location + ajaxLocation = document.createElement( "a" ); + ajaxLocation.href = ""; + ajaxLocation = ajaxLocation.href; +} + +// Base "constructor" for jQuery.ajaxPrefilter and jQuery.ajaxTransport +function addToPrefiltersOrTransports( structure ) { + + // dataTypeExpression is optional and defaults to "*" + return function( dataTypeExpression, func ) { + + if ( typeof dataTypeExpression !== "string" ) { + func = dataTypeExpression; + dataTypeExpression = "*"; + } + + if ( jQuery.isFunction( func ) ) { + var dataTypes = dataTypeExpression.toLowerCase().split( rspacesAjax ), + i = 0, + length = dataTypes.length, + dataType, + list, + placeBefore; + + // For each dataType in the dataTypeExpression + for(; i < length; i++ ) { + dataType = dataTypes[ i ]; + // 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" ]( func ); + } + } + }; +} + +//Base inspection function for prefilters and transports +function inspectPrefiltersOrTransports( structure, options, originalOptions, jqXHR, + dataType /* internal */, inspected /* internal */ ) { + + dataType = dataType || options.dataTypes[ 0 ]; + inspected = inspected || {}; + + inspected[ dataType ] = true; + + var list = structure[ dataType ], + i = 0, + length = list ? list.length : 0, + executeOnly = ( structure === prefilters ), + selection; + + for(; i < length && ( executeOnly || !selection ); i++ ) { + selection = list[ i ]( options, originalOptions, jqXHR ); + // If we got redirected to another dataType + // we try there if not done already + if ( typeof selection === "string" ) { + if ( inspected[ selection ] ) { + selection = undefined; + } else { + options.dataTypes.unshift( selection ); + selection = inspectPrefiltersOrTransports( + structure, options, originalOptions, jqXHR, selection, inspected ); + } + } + } + // If we're only executing or nothing was selected + // we try the catchall dataType if not done already + if ( ( executeOnly || !selection ) && !inspected[ "*" ] ) { + selection = inspectPrefiltersOrTransports( + structure, options, originalOptions, jqXHR, "*", inspected ); + } + // unnecessary when only executing (prefilters) + // but it'll be ignored by the caller in that case + return selection; +} jQuery.fn.extend({ load: function( url, params, callback ) { @@ -29,10 +137,10 @@ jQuery.fn.extend({ return this; } - var off = url.indexOf(" "); + var off = url.indexOf( " " ); if ( off >= 0 ) { - var selector = url.slice(off, url.length); - url = url.slice(0, off); + var selector = url.slice( off, url.length ); + url = url.slice( 0, off ); } // Default to a GET request @@ -62,14 +170,14 @@ jQuery.fn.extend({ dataType: "html", data: params, // Complete callback (responseText is used internally) - complete: function( jXHR, status, responseText ) { - // Store the response as specified by the jXHR object - responseText = jXHR.responseText; + complete: function( jqXHR, status, responseText ) { + // Store the response as specified by the jqXHR object + responseText = jqXHR.responseText; // If successful, inject the HTML into all the matched elements - if ( jXHR.isResolved() ) { + if ( jqXHR.isResolved() ) { // #4825: Get the actual response in case // a dataFilter is present in ajaxSettings - jXHR.done(function( r ) { + jqXHR.done(function( r ) { responseText = r; }); // See if a selector was specified @@ -88,7 +196,7 @@ jQuery.fn.extend({ } if ( callback ) { - self.each( callback, [responseText, status, jXHR] ); + self.each( callback, [ responseText, status, jqXHR ] ); } } }); @@ -97,42 +205,42 @@ jQuery.fn.extend({ }, serialize: function() { - return jQuery.param(this.serializeArray()); + return jQuery.param( this.serializeArray() ); }, serializeArray: function() { return this.map(function(){ - return this.elements ? jQuery.makeArray(this.elements) : this; + return this.elements ? jQuery.makeArray( this.elements ) : this; }) .filter(function(){ return this.name && !this.disabled && - (this.checked || rselectTextarea.test(this.nodeName) || - rinput.test(this.type)); + ( this.checked || rselectTextarea.test( this.nodeName ) || + rinput.test( this.type ) ); }) - .map(function(i, elem){ - var val = jQuery(this).val(); + .map(function( i, elem ){ + var val = jQuery( this ).val(); return val == null ? null : - jQuery.isArray(val) ? - jQuery.map( val, function(val, i){ - return { name: elem.name, value: val.replace(rCRLF, "\r\n") }; + jQuery.isArray( val ) ? + jQuery.map( val, function( val, i ){ + return { name: elem.name, value: val.replace( rCRLF, "\r\n" ) }; }) : - { name: elem.name, value: val.replace(rCRLF, "\r\n") }; + { name: elem.name, value: val.replace( rCRLF, "\r\n" ) }; }).get(); } }); // Attach a bunch of functions for handling common AJAX events -jQuery.each( "ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "), function(i,o){ - jQuery.fn[o] = function(f){ - return this.bind(o, f); +jQuery.each( "ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split( " " ), function( i, o ){ + jQuery.fn[ o ] = function( f ){ + return this.bind( o, f ); }; -}); +} ); jQuery.each( [ "get", "post" ], function( i, method ) { jQuery[ method ] = function( url, data, callback, type ) { - // shift arguments if data argument was omited + // shift arguments if data argument was omitted if ( jQuery.isFunction( data ) ) { type = type || callback; callback = data; @@ -147,16 +255,16 @@ jQuery.each( [ "get", "post" ], function( i, method ) { dataType: type }); }; -}); +} ); jQuery.extend({ getScript: function( url, callback ) { - return jQuery.get(url, null, callback, "script"); + return jQuery.get( url, null, callback, "script" ); }, getJSON: function( url, data, callback ) { - return jQuery.get(url, data, callback, "json"); + return jQuery.get( url, data, callback, "json" ); }, ajaxSetup: function( settings ) { @@ -167,7 +275,7 @@ jQuery.extend({ }, ajaxSettings: { - url: location.href, + url: ajaxLocation, global: true, type: "GET", contentType: "application/x-www-form-urlencoded", @@ -204,22 +312,6 @@ jQuery.extend({ text: "responseText" }, - // Prefilters - // 1) They are useful to introduce custom dataTypes (see transport/jsonp for an example) - // 2) These are called: - // * BEFORE asking for a transport - // * AFTER param serialization (s.data is a string if s.processData is true) - // 3) key is the dataType - // 4) the catchall symbol "*" can be used - // 5) execution will start with transport dataType and THEN continue down to "*" if needed - prefilters: {}, - - // Transports bindings - // 1) key is the dataType - // 2) the catchall symbol "*" can be used - // 3) selection will start with transport dataType and THEN go to "*" if needed - transports: {}, - // 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 @@ -239,20 +331,14 @@ jQuery.extend({ } }, - ajaxPrefilter: function( a , b ) { - ajaxPrefilterOrTransport( "prefilters" , a , b ); - }, - - ajaxTransport: function( a , b ) { - return ajaxPrefilterOrTransport( "transports" , a , b ); - }, + ajaxPrefilter: addToPrefiltersOrTransports( prefilters ), + ajaxTransport: addToPrefiltersOrTransports( transports ), // Main method - ajax: function( url , options ) { + ajax: function( url, options ) { - // If options is not an object, - // we simulate pre-1.5 signature - if ( typeof( options ) !== "object" ) { + // If url is an object, simulate pre-1.5 signature + if ( typeof url === "object" ) { options = url; url = undefined; } @@ -261,22 +347,25 @@ jQuery.extend({ options = options || {}; 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 + s = jQuery.extend( true, {}, jQuery.ajaxSettings, 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, - 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(), // Status-dependent callbacks statusCode = s.statusCode || {}, + // ifModified key + ifModifiedKey, // Headers (they are sent all at once) requestHeaders = {}, // Response headers @@ -287,20 +376,18 @@ jQuery.extend({ // timeout handle timeoutTimer, // Cross-domain detection vars - loc = document.location, - protocol = loc.protocol || "http:", parts, - // The jXHR state + // The jqXHR state state = 0, // Loop variable i, // Fake xhr - jXHR = { + jqXHR = { readyState: 0, // Caches the header - setRequestHeader: function(name,value) { + setRequestHeader: function( name, value ) { if ( state === 0 ) { requestHeaders[ name.toLowerCase() ] = value; } @@ -314,32 +401,26 @@ jQuery.extend({ // Builds headers hashtable if needed getResponseHeader: function( key ) { - var match; - if ( state === 2 ) { - if ( !responseHeaders ) { - responseHeaders = {}; - while( ( match = rheaders.exec( responseHeadersString ) ) ) { - responseHeaders[ match[ 1 ].toLowerCase() ] = match[ 2 ]; + responseHeaders[ match[1].toLowerCase() ] = match[ 2 ]; } } match = responseHeaders[ key.toLowerCase() ]; - } - return match || null; }, // Cancel the request abort: function( statusText ) { + statusText = statusText || "abort"; if ( transport ) { - transport.abort( statusText || "abort" ); + transport.abort( statusText ); } - done( 0 , statusText ); + done( 0, statusText ); return this; } }; @@ -347,7 +428,7 @@ 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 , responses , headers) { + function done( status, statusText, responses, headers) { // Called once if ( state === 2 ) { @@ -357,109 +438,27 @@ jQuery.extend({ // State is "done" now state = 2; + // Clear timeout if it exists + if ( timeoutTimer ) { + clearTimeout( timeoutTimer ); + } + // Dereference transport for early garbage collection - // (no matter how long the jXHR object will be used) + // (no matter how long the jqXHR object will be used) transport = undefined; - // Set readyState - jXHR.readyState = status ? 4 : 0; - // Cache response headers responseHeadersString = headers || ""; - // Clear timeout if it exists - if ( timeoutTimer ) { - clearTimeout(timeoutTimer); - } - - var // Reference dataTypes, converters and responseFields - dataTypes = s.dataTypes, - converters = s.converters, - responseFields = s.responseFields, - responseField, + // Set readyState + jqXHR.readyState = status ? 4 : 0; - // Flag to mark as success - isSuccess, - // Stored success + var isSuccess, success, - // Stored 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, - firstDataType; - - // Auto (xml, json, script or text determined given headers) - if ( transportDataType === "*" ) { - - // Remove all auto types - while( dataTypes[0] === "*" ) { - dataTypes.shift(); - } - transportDataTypes = dataTypes[0]; - - // Get content type - ct = jXHR.getResponseHeader( "content-type" ); - - // Check if it's a known type - for ( type in contents ) { - if ( contents[ type ] && contents[ type ].test( ct ) ) { - dataTypes.unshift( ( transportDataType = type ) ); - break; - } - } - } - - // Check to see if we have a response for the expected dataType - if ( transportDataType in responses ) { - finalDataType = transportDataType; - } else { - // Try convertible dataTypes - for ( type in responses ) { - if ( ! firstDataType ) { - firstDataType = type; - } - if ( ! transportDataType || converters[ type + " " + transportDataType ] ) { - finalDataType = type; - break; - } - } - // Or just use first one - finalDataType = finalDataType || firstDataType; - } - - // If we found a dataType - // We get the corresponding response - // and add the dataType to the list if needed - if ( finalDataType ) { - response = responses[ finalDataType ]; - if ( finalDataType !== transportDataType ) { - dataTypes.unshift( finalDataType ); - } - } - - // Fill responseXXX fields - for( type in responseFields ) { - if ( type in responses ) { - jXHR[ responseFields[ type ] ] = responses[ type ]; - } - } - } + response = responses ? ajaxHandleResponses( s, jqXHR, responses ) : undefined, + lastModified, + etag; // If successful, handle type chaining if ( status >= 200 && status < 300 || status === 304 ) { @@ -467,14 +466,11 @@ jQuery.extend({ // 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; + if ( ( lastModified = jqXHR.getResponseHeader( "Last-Modified" ) ) ) { + jQuery.lastModified[ ifModifiedKey ] = lastModified; } - if (etag) { - jQuery_etag[ s.url ] = etag; + if ( ( etag = jqXHR.getResponseHeader( "Etag" ) ) ) { + jQuery.etag[ ifModifiedKey ] = etag; } } @@ -482,203 +478,118 @@ jQuery.extend({ if ( status === 304 ) { statusText = "notmodified"; - isSuccess = 1; + isSuccess = true; // 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, - tmp, - // Current dataType - current, - // Previous dataType - prev, - // Conversion expression - conversion, - // Conversion function - conv, - // Conversion functions (when text is used in-between) - conv1, - conv2; - - // For each dataType in the chain - for( i = 0 ; i < dataTypes.length ; i++ ) { - - current = dataTypes[ i ]; - - // 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 auto and dataTypes are actually different - if ( prev !== "*" && current !== "*" && prev !== current ) { - - // Get the converter - conversion = prev + " " + current; - conv = converters[ conversion ] || converters[ "* " + current ]; - - // If there is no direct converter, search transitively - if ( ! conv ) { - conv1 = conv2 = undefined; - - for( conv1 in converters ) { - tmp = conv1.split( " " ); - if ( tmp[ 0 ] === prev || tmp[ 0 ] === "*" ) { - conv2 = converters[ tmp[ 1 ] + " " + current ]; - if ( conv2 ) { - conv1 = converters[ conv1 ]; - if ( conv1 === true ) { - conv = conv2; - } else if ( conv2 === true ) { - conv = conv1; - } - break; - } - } - } - } - // 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 ) { - // 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 + success = ajaxConvert( s, response ); + statusText = "success"; + isSuccess = true; } catch(e) { - // We have a parsererror statusText = "parsererror"; - error = "" + e; - + error = e; } } - - // if not success, mark it as an error } else { - error = statusText = statusText || "error"; + // We extract error from statusText + // then normalize statusText and status for non-aborts + error = statusText; + if( status ) { + statusText = "error"; + if ( status < 0 ) { + status = 0; + } + } } // Set data for the fake xhr object - jXHR.status = status; - jXHR.statusText = statusText; + jqXHR.status = status; + jqXHR.statusText = statusText; // Success/Error if ( isSuccess ) { - deferred.resolveWith( callbackContext , [ success , statusText , jXHR ] ); + deferred.resolveWith( callbackContext, [ success, statusText, jqXHR ] ); } else { - deferred.rejectWith( callbackContext , [ jXHR , statusText , error ] ); + deferred.rejectWith( callbackContext, [ jqXHR, statusText, error ] ); } // Status-dependent callbacks - oldStatusCode = statusCode; + jqXHR.statusCode( statusCode ); statusCode = undefined; - jXHR.statusCode( oldStatusCode ); if ( s.global ) { - globalEventContext.trigger( "ajax" + ( isSuccess ? "Success" : "Error" ) , - [ jXHR , s , isSuccess ? success : error ] ); + globalEventContext.trigger( "ajax" + ( isSuccess ? "Success" : "Error" ), + [ jqXHR, s, isSuccess ? success : error ] ); } // Complete - completeDeferred.resolveWith( callbackContext, [ jXHR , statusText ] ); + completeDeferred.resolveWith( callbackContext, [ jqXHR, statusText ] ); if ( s.global ) { - globalEventContext.trigger( "ajaxComplete" , [ jXHR , s] ); + globalEventContext.trigger( "ajaxComplete", [ jqXHR, s] ); // Handle the global AJAX counter - if ( ! --jQuery.active ) { + if ( !( --jQuery.active ) ) { jQuery.event.trigger( "ajaxStop" ); } } } // Attach deferreds - deferred.promise( jXHR ); - jXHR.success = jXHR.done; - jXHR.error = jXHR.fail; - jXHR.complete = completeDeferred.done; + deferred.promise( jqXHR ); + jqXHR.success = jqXHR.done; + jqXHR.error = jqXHR.fail; + jqXHR.complete = completeDeferred.done; // Status-dependent callbacks - jXHR.statusCode = function( map ) { + jqXHR.statusCode = function( map ) { if ( map ) { var tmp; - if ( statusCode ) { + if ( state < 2 ) { for( tmp in map ) { - statusCode[ tmp ] = [ statusCode[ tmp ] , map[ tmp ] ]; + statusCode[ tmp ] = [ statusCode[tmp], map[tmp] ]; } } else { - tmp = map[ jXHR.status ]; - jXHR.done( tmp ).fail( tmp ); + tmp = map[ jqXHR.status ]; + jqXHR.then( tmp, tmp ); } } return this; }; // 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 , "" ); + s.url = ( "" + ( url || s.url ) ).replace( rhash, "" ).replace( rprotocol, ajaxLocation[ 1 ] + "//" ); // Extract dataTypes list - s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().split( /\s+/ ); + s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().split( rspacesAjax ); // Determine if a cross-domain request is in order - if ( ! s.crossDomain ) { + 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 ) ) ) + s.crossDomain = !!( parts && + ( parts[ 1 ] != ajaxLocation[ 1 ] || parts[ 2 ] != ajaxLocation[ 2 ] || + ( parts[ 3 ] || ( parts[ 1 ] === "http:" ? 80 : 443 ) ) != + ( ajaxLocation[ 3 ] || ( ajaxLocation[ 1 ] === "http:" ? 80 : 443 ) ) ) ); } // Convert data if not already a string if ( s.data && s.processData && typeof s.data !== "string" ) { - s.data = jQuery.param( s.data , s.traditional ); + s.data = jQuery.param( s.data, s.traditional ); } // Apply prefilters - jQuery.ajaxPrefilter( s , options ); + inspectPrefiltersOrTransports( prefilters, s, options, jqXHR ); // Uppercase the type s.type = s.type.toUpperCase(); // Determine if request has content - s.hasContent = ! rnoContent.test( s.type ); + s.hasContent = !rnoContent.test( s.type ); // Watch for a new set of requests if ( s.global && jQuery.active++ === 0 ) { @@ -686,22 +597,25 @@ jQuery.extend({ } // More options handling for requests with no content - if ( ! s.hasContent ) { + if ( !s.hasContent ) { // If data is available, append data to url if ( s.data ) { s.url += ( rquery.test( s.url ) ? "&" : "?" ) + s.data; } + // Get ifModifiedKey before adding the anti-cache parameter + ifModifiedKey = s.url; + // 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 ); + 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 : ""); + s.url = ret + ( (ret === s.url ) ? ( rquery.test( s.url ) ? "&" : "?" ) + "_=" + ts : "" ); } } @@ -712,17 +626,18 @@ jQuery.extend({ // 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 ]; + ifModifiedKey = ifModifiedKey || s.url; + if ( jQuery.lastModified[ ifModifiedKey ] ) { + requestHeaders[ "if-modified-since" ] = jQuery.lastModified[ ifModifiedKey ]; } - if ( jQuery_etag[ s.url ] ) { - requestHeaders[ "if-none-match" ] = jQuery_etag[ s.url ]; + if ( jQuery.etag[ ifModifiedKey ] ) { + requestHeaders[ "if-none-match" ] = jQuery.etag[ ifModifiedKey ]; } } // 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" : "" ) : + 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 @@ -731,65 +646,53 @@ jQuery.extend({ } // Allow custom headers/mimetypes and early abort - if ( s.beforeSend && ( s.beforeSend.call( callbackContext , jXHR , s ) === false || state === 2 ) ) { - + if ( s.beforeSend && ( s.beforeSend.call( callbackContext, jqXHR, s ) === false || state === 2 ) ) { // Abort if not done already - done( 0 , "abort" ); - + done( 0, "abort" ); // Return false - jXHR = false; + jqXHR = false; } else { // Install callbacks on deferreds - for ( i in { success:1, error:1, complete:1 } ) { - jXHR[ i ]( s[ i ] ); + for ( i in { success: 1, error: 1, complete: 1 } ) { + jqXHR[ i ]( s[ i ] ); } // Get transport - transport = jQuery.ajaxTransport( s , options ); + transport = inspectPrefiltersOrTransports( transports, s, options, jqXHR ); // If no transport, we auto-abort - if ( ! transport ) { - - done( 0 , "notransport" ); - + if ( !transport ) { + done( -1, "No Transport" ); } else { - // Set state as sending - state = jXHR.readyState = 1; - + state = jqXHR.readyState = 1; // Send global event if ( s.global ) { - globalEventContext.trigger( "ajaxSend" , [ jXHR , s ] ); + globalEventContext.trigger( "ajaxSend", [ jqXHR, s ] ); } - // Timeout if ( s.async && s.timeout > 0 ) { - timeoutTimer = setTimeout(function(){ - jXHR.abort( "timeout" ); - }, s.timeout); + timeoutTimer = setTimeout( function(){ + jqXHR.abort( "timeout" ); + }, s.timeout ); } - // Try to send try { - transport.send(requestHeaders, done); + transport.send( requestHeaders, done ); } catch (e) { // Propagate exception as error if not done - if ( status === 1 ) { - - done(0, "error", "" + e); - jXHR = false; - + if ( status < 2 ) { + done( -1, e ); // Simply rethrow otherwise } else { - jQuery.error(e); + jQuery.error( e ); } } } } - - return jXHR; + return jqXHR; }, // Serialize an array of form elements or a set of @@ -798,8 +701,8 @@ jQuery.extend({ var s = [], add = function( key, value ) { // If value is a function, invoke it and return its value - value = jQuery.isFunction(value) ? value() : value; - s[ s.length ] = encodeURIComponent(key) + "=" + encodeURIComponent(value); + value = jQuery.isFunction( value ) ? value() : value; + s[ s.length ] = encodeURIComponent( key ) + "=" + encodeURIComponent( value ); }; // Set traditional to true for jQuery <= 1.3.2 behavior. @@ -808,27 +711,30 @@ jQuery.extend({ } // If an array was passed in, assume that it is an array of form elements. - if ( jQuery.isArray(a) || a.jquery ) { + if ( jQuery.isArray( a ) || ( a.jquery && !jQuery.isPlainObject( a ) ) ) { // Serialize the form elements jQuery.each( a, function() { add( this.name, this.value ); - }); + } ); } else { // If traditional, encode the "old" way (the way 1.3.2 or older // did it), otherwise encode params recursively. for ( var prefix in a ) { - buildParams( prefix, a[prefix], traditional, add ); + buildParams( prefix, a[ prefix ], traditional, add ); } } // Return the resulting serialization - return s.join("&").replace(r20, "+"); + return s.join( "&" ).replace( r20, "+" ); } }); +// Segment ajaxLocation into parts +ajaxLocation = rurl.exec( ajaxLocation.toLowerCase() ); + function buildParams( prefix, obj, traditional, add ) { - if ( jQuery.isArray(obj) && obj.length ) { + if ( jQuery.isArray( obj ) && obj.length ) { // Serialize array item. jQuery.each( obj, function( i, v ) { if ( traditional || rbracket.test( prefix ) ) { @@ -855,9 +761,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 { @@ -879,97 +785,158 @@ jQuery.extend({ }); -// Base function for both ajaxPrefilter and ajaxTransport -function ajaxPrefilterOrTransport( arg0 , arg1 , arg2 ) { - - var type = jQuery.type( arg1 ), - structure = jQuery.ajaxSettings[ arg0 ], - i, - 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; - } +/* Handles responses to an ajax request: + * - sets all responseXXX fields accordingly + * - finds the right dataType (mediates between content-type and expected dataType) + * - returns the corresponding response + */ +function ajaxHandleResponses( s, jqXHR, responses ) { + + var contents = s.contents, + dataTypes = s.dataTypes, + responseFields = s.responseFields, + ct, + type, + finalDataType, + firstDataType; + + // Fill responseXXX fields + for( type in responseFields ) { + if ( type in responses ) { + jqXHR[ responseFields[type] ] = responses[ type ]; + } + } - }; + // Remove auto dataType and get content-type in the process + while( dataTypes[ 0 ] === "*" ) { + dataTypes.shift(); + if ( ct === undefined ) { + ct = jqXHR.getResponseHeader( "content-type" ); + } + } - // Start inspection with current transport dataType - return inspect( options.dataTypes[ 0 ] , {} ); + // Check if we're dealing with a known content-type + if ( ct ) { + for ( type in contents ) { + if ( contents[ type ] && contents[ type ].test( ct ) ) { + dataTypes.unshift( type ); + break; + } + } + } + // Check to see if we have a response for the expected dataType + if ( dataTypes[ 0 ] in responses ) { + finalDataType = dataTypes[ 0 ]; } else { + // Try convertible dataTypes + for ( type in responses ) { + if ( !dataTypes[ 0 ] || s.converters[ type + " " + dataTypes[0] ] ) { + finalDataType = type; + break; + } + if ( !firstDataType ) { + firstDataType = type; + } + } + // Or just use first one + finalDataType = finalDataType || firstDataType; + } - // We're requested to add to the structure - // Signature is ( dataTypeExpression , function ) - // with dataTypeExpression being optional and - // defaulting to catchAll (*) - type = type === "function"; - - if ( type ) { - arg2 = arg1; - arg1 = undefined; + // If we found a dataType + // We add the dataType to the list if needed + // and return the corresponding response + if ( finalDataType ) { + if ( finalDataType !== dataTypes[ 0 ] ) { + dataTypes.unshift( finalDataType ); } - arg1 = arg1 || "*"; + return responses[ finalDataType ]; + } +} - // We control that the second argument is really a function - if ( type || jQuery.isFunction( arg2 ) ) { +// Chain conversions given the request and the original response +function ajaxConvert( s, response ) { - var dataTypes = arg1.split( /\s+/ ), - functor = arg2, - dataType, - list, - placeBefore; + // Apply the dataFilter if provided + if ( s.dataFilter ) { + response = s.dataFilter( response, s.dataType ); + } - // For each dataType in the dataTypeExpression - for( i = 0 , length = dataTypes.length ; i < length ; i++ ) { - dataType = dataTypes[ i ]; - // We control if we're asked to add before - // any existing element - placeBefore = /^\+/.test( dataType ); - if ( placeBefore ) { - dataType = dataType.substr( 1 ); + var dataTypes = s.dataTypes, + converters = {}, + i, + key, + length = dataTypes.length, + tmp, + // Current and previous dataTypes + current = dataTypes[ 0 ], + prev, + // Conversion expression + conversion, + // Conversion function + conv, + // 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 ]; } - list = structure[ dataType ] = structure[ dataType ] || []; - // then we add to the structure accordingly - list[ placeBefore ? "unshift" : "push" ]( functor ); + } + } + + // Get the dataTypes + prev = current; + current = dataTypes[ i ]; + + // If current is auto dataType, update it to prev + if( current === "*" ) { + current = prev; + // If no auto and dataTypes are actually different + } else if ( prev !== "*" && prev !== current ) { + + // Get the converter + conversion = prev + " " + current; + conv = converters[ conversion ] || converters[ "* " + current ]; + + // If there is no direct converter, search transitively + if ( !conv ) { + conv2 = undefined; + for( conv1 in converters ) { + tmp = conv1.split( " " ); + if ( tmp[ 0 ] === prev || tmp[ 0 ] === "*" ) { + conv2 = converters[ tmp[1] + " " + current ]; + if ( conv2 ) { + conv1 = converters[ conv1 ]; + if ( conv1 === true ) { + conv = conv2; + } else if ( conv2 === true ) { + conv = conv1; + } + break; + } + } + } + } + // If we found no converter, dispatch an error + if ( !( conv || conv2 ) ) { + jQuery.error( "No conversion from " + conversion.replace(" "," to ") ); + } + // If found converter is not an equivalence + if ( conv !== true ) { + // Convert with 1 or 2 converters accordingly + response = conv ? conv( response ) : conv2( conv1(response) ); } } } + return response; } })( jQuery );