deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Apply JQuery Core Style Guidelines to ajax.js and ajax/*.js,

Browse source
This commit is contained in:
jaubourg 2011-01-23 05:51:41 +01:00
parent 30082d9eba
commit dd5bf42122
4 changed files with 182 additions and 199 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

238
src/ajax.js
View file

@ -20,20 +20,22 @@ var r20 = /%20/g,
// Keep a copy of the old load method // Keep a copy of the old load method
_load = jQuery.fn.load, _load = jQuery.fn.load,
// Prefilters /* Prefilters
// 1) They are useful to introduce custom dataTypes (see transport/jsonp for an example) * 1) They are useful to introduce custom dataTypes (see ajax/jsonp.js for an example)
// 2) These are called: * 2) These are called:
// * BEFORE asking for a transport * - BEFORE asking for a transport
// * AFTER param serialization (s.data is a string if s.processData is true) * - AFTER param serialization (s.data is a string if s.processData is true)
// 3) key is the dataType * 3) key is the dataType
// 4) the catchall symbol "*" can be used * 4) the catchall symbol "*" can be used
// 5) execution will start with transport dataType and THEN continue down to "*" if needed * 5) execution will start with transport dataType and THEN continue down to "*" if needed
*/
prefilters = {}, prefilters = {},
// Transports bindings /* Transports bindings
// 1) key is the dataType * 1) key is the dataType
// 2) the catchall symbol "*" can be used * 2) the catchall symbol "*" can be used
// 3) selection will start with transport dataType and THEN go to "*" if needed * 3) selection will start with transport dataType and THEN go to "*" if needed
*/
transports = {}; transports = {};
jQuery.fn.extend({ jQuery.fn.extend({
@ -46,10 +48,10 @@ jQuery.fn.extend({
return this; return this;
} }
var off = url.indexOf(" "); var off = url.indexOf( " " );
if ( off >= 0 ) { if ( off >= 0 ) {
var selector = url.slice(off, url.length); var selector = url.slice( off, url.length );
url = url.slice(0, off); url = url.slice( 0, off );
} }
// Default to a GET request // Default to a GET request
@ -105,7 +107,7 @@ jQuery.fn.extend({
} }
if ( callback ) { if ( callback ) {
self.each( callback, [responseText, status, jXHR] ); self.each( callback, [ responseText, status, jXHR ] );
} }
} }
}); });
@ -114,42 +116,42 @@ jQuery.fn.extend({
}, },
serialize: function() { serialize: function() {
return jQuery.param(this.serializeArray()); return jQuery.param( this.serializeArray() );
}, },
serializeArray: function() { serializeArray: function() {
return this.map(function(){ return this.map(function(){
return this.elements ? jQuery.makeArray(this.elements) : this; return this.elements ? jQuery.makeArray( this.elements ) : this;
}) })
.filter(function(){ .filter(function(){
return this.name && !this.disabled && return this.name && !this.disabled &&
(this.checked || rselectTextarea.test(this.nodeName) || ( this.checked || rselectTextarea.test( this.nodeName ) ||
rinput.test(this.type)); rinput.test( this.type ) );
}) })
.map(function(i, elem){ .map(function( i, elem ){
var val = jQuery(this).val(); var val = jQuery( this ).val();
return val == null ? return val == null ?
null : null :
jQuery.isArray(val) ? jQuery.isArray( val ) ?
jQuery.map( val, function(val, i){ jQuery.map( val, function( val, i ){
return { name: elem.name, value: val.replace(rCRLF, "\r\n") }; 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(); }).get();
} }
}); });
// Attach a bunch of functions for handling common AJAX events // Attach a bunch of functions for handling common AJAX events
jQuery.each( "ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "), function(i,o){ jQuery.each( "ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split( " " ), function( i, o ){
jQuery.fn[o] = function(f){ jQuery.fn[ o ] = function( f ){
return this.bind(o, f); return this.bind( o, f );
}; };
}); } );
jQuery.each( [ "get", "post" ], function( i, method ) { jQuery.each( [ "get", "post" ], function( i, method ) {
jQuery[ method ] = function( url, data, callback, type ) { 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 ) ) { if ( jQuery.isFunction( data ) ) {
type = type || callback; type = type || callback;
callback = data; callback = data;
@ -164,16 +166,16 @@ jQuery.each( [ "get", "post" ], function( i, method ) {
dataType: type dataType: type
}); });
}; };
}); } );
jQuery.extend({ jQuery.extend({
getScript: function( url, callback ) { getScript: function( url, callback ) {
return jQuery.get(url, null, callback, "script"); return jQuery.get( url, null, callback, "script" );
}, },
getJSON: function( url, data, callback ) { getJSON: function( url, data, callback ) {
return jQuery.get(url, data, callback, "json"); return jQuery.get( url, data, callback, "json" );
}, },
ajaxSetup: function( settings ) { ajaxSetup: function( settings ) {
@ -240,16 +242,16 @@ jQuery.extend({
} }
}, },
ajaxPrefilter: function( a , b ) { ajaxPrefilter: function( a, b ) {
prefiltersOrTransports( prefilters , a , b ); prefiltersOrTransports( prefilters, a, b );
}, },
ajaxTransport: function( a , b ) { ajaxTransport: function( a, b ) {
return prefiltersOrTransports( transports , a , b ); return prefiltersOrTransports( transports, a, b );
}, },
// Main method // Main method
ajax: function( url , options ) { ajax: function( url, options ) {
// If options is not an object, // If options is not an object,
// we simulate pre-1.5 signature // we simulate pre-1.5 signature
@ -262,7 +264,7 @@ jQuery.extend({
options = options || {}; options = options || {};
var // Create the final options object var // Create the final options object
s = jQuery.extend( true , {} , jQuery.ajaxSettings , options ), s = jQuery.extend( true, {}, jQuery.ajaxSettings, options ),
// Callbacks contexts // Callbacks contexts
// We force the original context if it exists // We force the original context if it exists
// or take it from jQuery.ajaxSettings otherwise // or take it from jQuery.ajaxSettings otherwise
@ -298,7 +300,7 @@ jQuery.extend({
readyState: 0, readyState: 0,
// Caches the header // Caches the header
setRequestHeader: function(name,value) { setRequestHeader: function( name, value ) {
if ( state === 0 ) { if ( state === 0 ) {
requestHeaders[ name.toLowerCase() ] = value; requestHeaders[ name.toLowerCase() ] = value;
} }
@ -317,7 +319,7 @@ jQuery.extend({
if ( !responseHeaders ) { if ( !responseHeaders ) {
responseHeaders = {}; responseHeaders = {};
while( ( match = rheaders.exec( responseHeadersString ) ) ) { while( ( match = rheaders.exec( responseHeadersString ) ) ) {
responseHeaders[ match[ 1 ].toLowerCase() ] = match[ 2 ]; responseHeaders[ match[1].toLowerCase() ] = match[ 2 ];
} }
} }
match = responseHeaders[ key.toLowerCase() ]; match = responseHeaders[ key.toLowerCase() ];
@ -330,7 +332,7 @@ jQuery.extend({
if ( transport ) { if ( transport ) {
transport.abort( statusText || "abort" ); transport.abort( statusText || "abort" );
} }
done( 0 , statusText ); done( 0, statusText );
return this; return this;
} }
}; };
@ -338,7 +340,7 @@ jQuery.extend({
// Callback for when everything is done // Callback for when everything is done
// It is defined here because jslint complains if it is declared // It is defined here because jslint complains if it is declared
// at the end of the function (which would be more logical and readable) // 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 // Called once
if ( state === 2 ) { if ( state === 2 ) {
@ -350,7 +352,7 @@ jQuery.extend({
// Clear timeout if it exists // Clear timeout if it exists
if ( timeoutTimer ) { if ( timeoutTimer ) {
clearTimeout(timeoutTimer); clearTimeout( timeoutTimer );
} }
// Dereference transport for early garbage collection // Dereference transport for early garbage collection
@ -366,7 +368,7 @@ jQuery.extend({
var isSuccess, var isSuccess,
success, success,
error = ( statusText = statusText || "error" ), error = ( statusText = statusText || "error" ),
response = responses ? ajaxHandleResponses( s , jXHR , responses ) : undefined, response = responses ? ajaxHandleResponses( s, jXHR, responses ) : undefined,
lastModified, lastModified,
etag; etag;
@ -376,10 +378,10 @@ jQuery.extend({
// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode. // Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
if ( s.ifModified ) { if ( s.ifModified ) {
if ( ( lastModified = jXHR.getResponseHeader("Last-Modified") ) ) { if ( ( lastModified = jXHR.getResponseHeader( "Last-Modified" ) ) ) {
jQuery.lastModified[ s.url ] = lastModified; jQuery.lastModified[ s.url ] = lastModified;
} }
if ( ( etag = jXHR.getResponseHeader("Etag") ) ) { if ( ( etag = jXHR.getResponseHeader( "Etag" ) ) ) {
jQuery.etag[ s.url ] = etag; jQuery.etag[ s.url ] = etag;
} }
} }
@ -394,7 +396,7 @@ jQuery.extend({
} else { } else {
try { try {
success = ajaxConvert( s , response ); success = ajaxConvert( s, response );
statusText = "success"; statusText = "success";
isSuccess = true; isSuccess = true;
} catch(e) { } catch(e) {
@ -411,9 +413,9 @@ jQuery.extend({
// Success/Error // Success/Error
if ( isSuccess ) { if ( isSuccess ) {
deferred.resolveWith( callbackContext , [ success , statusText , jXHR ] ); deferred.resolveWith( callbackContext, [ success, statusText, jXHR ] );
} else { } else {
deferred.rejectWith( callbackContext , [ jXHR , statusText , error ] ); deferred.rejectWith( callbackContext, [ jXHR, statusText, error ] );
} }
// Status-dependent callbacks // Status-dependent callbacks
@ -422,14 +424,14 @@ jQuery.extend({
if ( s.global ) { if ( s.global ) {
globalEventContext.trigger( "ajax" + ( isSuccess ? "Success" : "Error" ) , globalEventContext.trigger( "ajax" + ( isSuccess ? "Success" : "Error" ) ,
[ jXHR , s , isSuccess ? success : error ] ); [ jXHR, s, isSuccess ? success : error ] );
} }
// Complete // Complete
completeDeferred.resolveWith( callbackContext, [ jXHR , statusText ] ); completeDeferred.resolveWith( callbackContext, [ jXHR, statusText ] );
if ( s.global ) { if ( s.global ) {
globalEventContext.trigger( "ajaxComplete" , [ jXHR , s] ); globalEventContext.trigger( "ajaxComplete", [ jXHR, s] );
// Handle the global AJAX counter // Handle the global AJAX counter
if ( ! --jQuery.active ) { if ( ! --jQuery.active ) {
jQuery.event.trigger( "ajaxStop" ); jQuery.event.trigger( "ajaxStop" );
@ -449,7 +451,7 @@ jQuery.extend({
var tmp; var tmp;
if ( state < 2 ) { if ( state < 2 ) {
for( tmp in map ) { for( tmp in map ) {
statusCode[ tmp ] = [ statusCode[ tmp ] , map[ tmp ] ]; statusCode[ tmp ] = [ statusCode[tmp], map[tmp] ];
} }
} else { } else {
tmp = map[ jXHR.status ]; tmp = map[ jXHR.status ];
@ -461,13 +463,13 @@ jQuery.extend({
// Remove hash character (#7531: and string promotion) // Remove hash character (#7531: and string promotion)
// We also use the url parameter if available // We also use the url parameter if available
s.url = ( "" + ( url || s.url ) ).replace( rhash , "" ); s.url = ( "" + ( url || s.url ) ).replace( rhash, "" );
// Extract dataTypes list // Extract dataTypes list
s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().split( rspacesAjax ); s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().split( rspacesAjax );
// Determine if a cross-domain request is in order // Determine if a cross-domain request is in order
if ( ! s.crossDomain ) { if ( !s.crossDomain ) {
parts = rurl.exec( s.url.toLowerCase() ); parts = rurl.exec( s.url.toLowerCase() );
s.crossDomain = !!( s.crossDomain = !!(
parts && parts &&
@ -480,17 +482,17 @@ jQuery.extend({
// Convert data if not already a string // 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 ); s.data = jQuery.param( s.data, s.traditional );
} }
// Apply prefilters // Apply prefilters
jQuery.ajaxPrefilter( s , options ); jQuery.ajaxPrefilter( s, options );
// Uppercase the type // Uppercase the type
s.type = s.type.toUpperCase(); s.type = s.type.toUpperCase();
// Determine if request has content // Determine if request has content
s.hasContent = ! rnoContent.test( s.type ); s.hasContent = !rnoContent.test( s.type );
// Watch for a new set of requests // Watch for a new set of requests
if ( s.global && jQuery.active++ === 0 ) { if ( s.global && jQuery.active++ === 0 ) {
@ -498,7 +500,7 @@ jQuery.extend({
} }
// More options handling for requests with no content // More options handling for requests with no content
if ( ! s.hasContent ) { if ( !s.hasContent ) {
// If data is available, append data to url // If data is available, append data to url
if ( s.data ) { if ( s.data ) {
@ -510,10 +512,10 @@ jQuery.extend({
var ts = jQuery.now(), var ts = jQuery.now(),
// try replacing _= if it is there // 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 // 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 : "" );
} }
} }
@ -533,8 +535,8 @@ jQuery.extend({
} }
// Set the Accepts header for the server, depending on the dataType // Set the Accepts header for the server, depending on the dataType
requestHeaders.accept = s.dataTypes[ 0 ] && s.accepts[ s.dataTypes[ 0 ] ] ? requestHeaders.accept = s.dataTypes[ 0 ] && s.accepts[ s.dataTypes[0] ] ?
s.accepts[ s.dataTypes[ 0 ] ] + ( s.dataTypes[ 0 ] !== "*" ? ", */*; q=0.01" : "" ) : s.accepts[ s.dataTypes[0] ] + ( s.dataTypes[ 0 ] !== "*" ? ", */*; q=0.01" : "" ) :
s.accepts[ "*" ]; s.accepts[ "*" ];
// Check for headers option // Check for headers option
@ -543,11 +545,9 @@ jQuery.extend({
} }
// Allow custom headers/mimetypes and early abort // 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, jXHR, s ) === false || state === 2 ) ) {
// Abort if not done already // Abort if not done already
done( 0 , "abort" ); done( 0, "abort" );
// Return false // Return false
jXHR = false; jXHR = false;
@ -559,43 +559,39 @@ jQuery.extend({
} }
// Get transport // Get transport
transport = jQuery.ajaxTransport( s , options ); transport = jQuery.ajaxTransport( s, options );
// If no transport, we auto-abort // If no transport, we auto-abort
if ( ! transport ) { if ( !transport ) {
done( 0 , "notransport" ); done( 0, "notransport" );
} else { } else {
// Set state as sending // Set state as sending
state = jXHR.readyState = 1; state = jXHR.readyState = 1;
// Send global event // Send global event
if ( s.global ) { if ( s.global ) {
globalEventContext.trigger( "ajaxSend" , [ jXHR , s ] ); globalEventContext.trigger( "ajaxSend", [ jXHR, s ] );
} }
// Timeout // Timeout
if ( s.async && s.timeout > 0 ) { if ( s.async && s.timeout > 0 ) {
timeoutTimer = setTimeout(function(){ timeoutTimer = setTimeout( function(){
jXHR.abort( "timeout" ); jXHR.abort( "timeout" );
}, s.timeout); }, s.timeout );
} }
try { try {
transport.send(requestHeaders, done); transport.send( requestHeaders, done );
} catch (e) { } catch (e) {
// Propagate exception as error if not done // Propagate exception as error if not done
if ( status === 1 ) { if ( status === 1 ) {
done(0, "error", "" + e); done( 0, "error", "" + e );
jXHR = false; jXHR = false;
// Simply rethrow otherwise // Simply rethrow otherwise
} else { } else {
jQuery.error(e); jQuery.error( e );
} }
} }
} }
} }
return jXHR; return jXHR;
}, },
@ -605,8 +601,8 @@ jQuery.extend({
var s = [], var s = [],
add = function( key, value ) { add = function( key, value ) {
// If value is a function, invoke it and return its value // If value is a function, invoke it and return its value
value = jQuery.isFunction(value) ? value() : value; value = jQuery.isFunction( value ) ? value() : value;
s[ s.length ] = encodeURIComponent(key) + "=" + encodeURIComponent(value); s[ s.length ] = encodeURIComponent( key ) + "=" + encodeURIComponent( value );
}; };
// Set traditional to true for jQuery <= 1.3.2 behavior. // Set traditional to true for jQuery <= 1.3.2 behavior.
@ -615,27 +611,27 @@ jQuery.extend({
} }
// If an array was passed in, assume that it is an array of form elements. // 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 ) {
// Serialize the form elements // Serialize the form elements
jQuery.each( a, function() { jQuery.each( a, function() {
add( this.name, this.value ); add( this.name, this.value );
}); } );
} else { } else {
// If traditional, encode the "old" way (the way 1.3.2 or older // If traditional, encode the "old" way (the way 1.3.2 or older
// did it), otherwise encode params recursively. // did it), otherwise encode params recursively.
for ( var prefix in a ) { for ( var prefix in a ) {
buildParams( prefix, a[prefix], traditional, add ); buildParams( prefix, a[ prefix ], traditional, add );
} }
} }
// Return the resulting serialization // Return the resulting serialization
return s.join("&").replace(r20, "+"); return s.join( "&" ).replace( r20, "+" );
} }
}); });
function buildParams( prefix, obj, traditional, add ) { function buildParams( prefix, obj, traditional, add ) {
if ( jQuery.isArray(obj) && obj.length ) { if ( jQuery.isArray( obj ) && obj.length ) {
// Serialize array item. // Serialize array item.
jQuery.each( obj, function( i, v ) { jQuery.each( obj, function( i, v ) {
if ( traditional || rbracket.test( prefix ) ) { if ( traditional || rbracket.test( prefix ) ) {
@ -687,12 +683,12 @@ jQuery.extend({
}); });
// Base inspection function for prefilters and transports // Base inspection function for prefilters and transports
function inspectPrefiltersOrTransports( structure , options , originalOptions , dataType , tested ) { function inspectPrefiltersOrTransports( structure, options, originalOptions, dataType, tested ) {
dataType = dataType || options.dataTypes[0]; dataType = dataType || options.dataTypes[ 0 ];
tested = tested || {}; tested = tested || {};
if ( ! tested[ dataType ] ) { if ( !tested[ dataType ] ) {
tested[ dataType ] = true; tested[ dataType ] = true;
@ -702,14 +698,14 @@ function inspectPrefiltersOrTransports( structure , options , originalOptions ,
executeOnly = structure === prefilters, executeOnly = structure === prefilters,
selected; selected;
for( ; ( executeOnly || ! selected ) && i < length ; i++ ) { for(; ( executeOnly || !selected ) && i < length; i++ ) {
selected = list[ i ]( options , originalOptions ); selected = list[ i ]( options, originalOptions );
// If we got redirected to a different dataType, // If we got redirected to a different dataType,
// we add it and switch to the corresponding list // we add it and switch to the corresponding list
if ( typeof( selected ) === "string" && selected !== dataType ) { if ( typeof( selected ) === "string" && selected !== dataType ) {
options.dataTypes.unshift( selected ); options.dataTypes.unshift( selected );
selected = inspectPrefiltersOrTransports( selected = inspectPrefiltersOrTransports(
structure , options , originalOptions , selected , tested ); structure, options, originalOptions, selected, tested );
// We always break in order not to continue // We always break in order not to continue
// to iterate in previous list // to iterate in previous list
break; break;
@ -717,9 +713,9 @@ function inspectPrefiltersOrTransports( structure , options , originalOptions ,
} }
// If we're only executing or nothing was selected // If we're only executing or nothing was selected
// we try the catchall dataType // we try the catchall dataType
if ( ! tested[ "*" ] && ( executeOnly || ! selected ) ) { if ( !tested[ "*" ] && ( executeOnly || ! selected ) ) {
selected = inspectPrefiltersOrTransports( selected = inspectPrefiltersOrTransports(
structure , options , originalOptions , "*" , tested ); structure, options, originalOptions, "*" ,tested );
} }
// This will be ignored by ajaxPrefilter // This will be ignored by ajaxPrefilter
// so it's safe to return no matter what // so it's safe to return no matter what
@ -727,7 +723,7 @@ function inspectPrefiltersOrTransports( structure , options , originalOptions ,
} }
} }
function addToPrefiltersOrTransports( structure , dataTypeExpression , functor ) { function addToPrefiltersOrTransports( structure, dataTypeExpression, functor ) {
var dataTypes = dataTypeExpression.split( rspacesAjax ), var dataTypes = dataTypeExpression.split( rspacesAjax ),
i = 0, i = 0,
@ -737,7 +733,7 @@ function addToPrefiltersOrTransports( structure , dataTypeExpression , functor )
placeBefore; placeBefore;
// For each dataType in the dataTypeExpression // For each dataType in the dataTypeExpression
for( ; i < length ; i++ ) { for(; i < length; i++ ) {
dataType = dataTypes[ i ]; dataType = dataTypes[ i ];
// We control if we're asked to add before // We control if we're asked to add before
// any existing element // any existing element
@ -752,13 +748,13 @@ function addToPrefiltersOrTransports( structure , dataTypeExpression , functor )
} }
// Base function for both ajaxPrefilter and ajaxTransport // Base function for both ajaxPrefilter and ajaxTransport
function prefiltersOrTransports( structure , arg1 , arg2 , type /* internal */ ) { function prefiltersOrTransports( structure, arg1, arg2, type /* internal */ ) {
type = jQuery.type( arg1 ); type = jQuery.type( arg1 );
if ( type === "object" ) { if ( type === "object" ) {
// We have an options map so we have to inspect the structure // We have an options map so we have to inspect the structure
return inspectPrefiltersOrTransports( structure , arg1 , arg2 ); return inspectPrefiltersOrTransports( structure, arg1, arg2 );
} else { } else {
// We're requested to add to the structure // We're requested to add to the structure
// Signature is ( dataTypeExpression , function ) // Signature is ( dataTypeExpression , function )
@ -771,16 +767,17 @@ function prefiltersOrTransports( structure , arg1 , arg2 , type /* internal */ )
} }
// We control that the second argument is really a function // We control that the second argument is really a function
if ( type || jQuery.isFunction( arg2 ) ) { if ( type || jQuery.isFunction( arg2 ) ) {
addToPrefiltersOrTransports( structure , arg1 || "*" , arg2 ); addToPrefiltersOrTransports( structure, arg1 || "*", arg2 );
} }
} }
} }
// Handles responses to an ajax request: /* Handles responses to an ajax request:
// - sets all responseXXX fields accordingly * - sets all responseXXX fields accordingly
// - finds the right dataType (mediating between content-type and expecting dataType) * - finds the right dataType (mediates between content-type and expected dataType)
// - returns the corresponding response * - returns the corresponding response
function ajaxHandleResponses( s , jXHR , responses ) { */
function ajaxHandleResponses( s, jXHR, responses ) {
var contents = s.contents, var contents = s.contents,
dataTypes = s.dataTypes, dataTypes = s.dataTypes,
@ -793,12 +790,12 @@ function ajaxHandleResponses( s , jXHR , responses ) {
// Fill responseXXX fields // Fill responseXXX fields
for( type in responseFields ) { for( type in responseFields ) {
if ( type in responses ) { if ( type in responses ) {
jXHR[ responseFields[ type ] ] = responses[ type ]; jXHR[ responseFields[type] ] = responses[ type ];
} }
} }
// Remove auto dataType and get content-type in the process // Remove auto dataType and get content-type in the process
while( dataTypes[0] === "*" ) { while( dataTypes[ 0 ] === "*" ) {
dataTypes.shift(); dataTypes.shift();
if ( ct === undefined ) { if ( ct === undefined ) {
ct = jXHR.getResponseHeader( "content-type" ); ct = jXHR.getResponseHeader( "content-type" );
@ -816,12 +813,12 @@ function ajaxHandleResponses( s , jXHR , responses ) {
} }
// Check to see if we have a response for the expected dataType // Check to see if we have a response for the expected dataType
if ( dataTypes[0] in responses ) { if ( dataTypes[ 0 ] in responses ) {
finalDataType = dataTypes[0]; finalDataType = dataTypes[ 0 ];
} else { } else {
// Try convertible dataTypes // Try convertible dataTypes
for ( type in responses ) { for ( type in responses ) {
if ( ! dataTypes[0] || s.converters[ type + " " + dataTypes[0] ] ) { if ( ! dataTypes[ 0 ] || s.converters[ type + " " + dataTypes[0] ] ) {
finalDataType = type; finalDataType = type;
break; break;
} }
@ -837,7 +834,7 @@ function ajaxHandleResponses( s , jXHR , responses ) {
// We add the dataType to the list if needed // We add the dataType to the list if needed
// and return the corresponding response // and return the corresponding response
if ( finalDataType ) { if ( finalDataType ) {
if ( finalDataType !== dataTypes[0] ) { if ( finalDataType !== dataTypes[ 0 ] ) {
dataTypes.unshift( finalDataType ); dataTypes.unshift( finalDataType );
} }
return responses[ finalDataType ]; return responses[ finalDataType ];
@ -845,11 +842,11 @@ function ajaxHandleResponses( s , jXHR , responses ) {
} }
// Chain conversions given the request and the original response // Chain conversions given the request and the original response
function ajaxConvert( s , response ) { function ajaxConvert( s, response ) {
// Apply the dataFilter if provided // Apply the dataFilter if provided
if ( s.dataFilter ) { if ( s.dataFilter ) {
response = s.dataFilter( response , s.dataType ); response = s.dataFilter( response, s.dataType );
} }
var dataTypes = s.dataTypes, var dataTypes = s.dataTypes,
@ -858,7 +855,7 @@ function ajaxConvert( s , response ) {
length = dataTypes.length, length = dataTypes.length,
tmp, tmp,
// Current and previous dataTypes // Current and previous dataTypes
current = dataTypes[0], current = dataTypes[ 0 ],
prev, prev,
// Conversion expression // Conversion expression
conversion, conversion,
@ -869,7 +866,7 @@ function ajaxConvert( s , response ) {
conv2; conv2;
// For each dataType in the chain // For each dataType in the chain
for( i = 1 ; i < length ; i++ ) { for( i = 1; i < length; i++ ) {
// Get the dataTypes // Get the dataTypes
prev = current; prev = current;
@ -891,7 +888,7 @@ function ajaxConvert( s , response ) {
for( conv1 in converters ) { for( conv1 in converters ) {
tmp = conv1.split( " " ); tmp = conv1.split( " " );
if ( tmp[ 0 ] === prev || tmp[ 0 ] === "*" ) { if ( tmp[ 0 ] === prev || tmp[ 0 ] === "*" ) {
conv2 = converters[ tmp[ 1 ] + " " + current ]; conv2 = converters[ tmp[1] + " " + current ];
if ( conv2 ) { if ( conv2 ) {
conv1 = converters[ conv1 ]; conv1 = converters[ conv1 ];
if ( conv1 === true ) { if ( conv1 === true ) {
@ -906,16 +903,15 @@ function ajaxConvert( s , response ) {
} }
// If we found no converter, dispatch an error // If we found no converter, dispatch an error
if ( ! ( conv || conv2 ) ) { if ( ! ( conv || conv2 ) ) {
jQuery.error( "No conversion from " + conversion.replace( " " , " to " ) ); jQuery.error( "No conversion from " + conversion.replace(" "," to ") );
} }
// If found converter is not an equivalence // If found converter is not an equivalence
if ( conv !== true ) { if ( conv !== true ) {
// Convert with 1 or 2 converters accordingly // Convert with 1 or 2 converters accordingly
response = conv ? conv( response ) : conv2( conv1( response ) ); response = conv ? conv( response ) : conv2( conv1(response) );
} }
} }
} }
return response; return response;
} }

20
src/ajax/jsonp.js
View file

@ -13,9 +13,9 @@ jQuery.ajaxSetup({
// Detect, normalize options and install callbacks for jsonp requests // Detect, normalize options and install callbacks for jsonp requests
// (dataIsString is used internally) // (dataIsString is used internally)
jQuery.ajaxPrefilter("json jsonp", function(s, originalSettings, dataIsString) { jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, dataIsString ) {
dataIsString = ( typeof(s.data) === "string" ); dataIsString = ( typeof( s.data ) === "string" );
if ( s.dataTypes[ 0 ] === "jsonp" || if ( s.dataTypes[ 0 ] === "jsonp" ||
originalSettings.jsonpCallback || originalSettings.jsonpCallback ||
@ -47,23 +47,25 @@ jQuery.ajaxPrefilter("json jsonp", function(s, originalSettings, dataIsString) {
s.url = url; s.url = url;
s.data = data; s.data = data;
window [ jsonpCallback ] = function( response ) { window[ jsonpCallback ] = function( response ) {
responseContainer = [response]; responseContainer = [ response ];
}; };
s.complete = [function() { s.complete = [ function() {
// Set callback back to previous value // Set callback back to previous value
window[ jsonpCallback ] = previous; window[ jsonpCallback ] = previous;
// Call if it was a function and we have a response // Call if it was a function and we have a response
if ( previous) { if ( previous) {
if ( responseContainer && jQuery.isFunction ( previous ) ) { if ( responseContainer && jQuery.isFunction( previous ) ) {
window[ jsonpCallback ] ( responseContainer[0] ); window[ jsonpCallback ] ( responseContainer[ 0 ] );
} }
} else { } else {
// else, more memory leak avoidance // else, more memory leak avoidance
try{ delete window[ jsonpCallback ]; } catch(e){} try{
delete window[ jsonpCallback ];
} catch( e ) {}
} }
}, s.complete ]; }, s.complete ];
@ -82,6 +84,6 @@ jQuery.ajaxPrefilter("json jsonp", function(s, originalSettings, dataIsString) {
// Delegate to script // Delegate to script
return "script"; return "script";
} }
}); } );
})( jQuery ); })( jQuery );

29
src/ajax/script.js
View file

@ -2,47 +2,42 @@
// Install script dataType // Install script dataType
jQuery.ajaxSetup({ jQuery.ajaxSetup({
accepts: { accepts: {
script: "text/javascript, application/javascript" script: "text/javascript, application/javascript"
}, },
contents: { contents: {
script: /javascript/ script: /javascript/
}, },
converters: { converters: {
"text script": jQuery.globalEval "text script": jQuery.globalEval
} }
}); });
// Handle cache's special case and global // Handle cache's special case and global
jQuery.ajaxPrefilter("script", function(s) { jQuery.ajaxPrefilter( "script", function(s) {
if ( s.cache === undefined ) { if ( s.cache === undefined ) {
s.cache = false; s.cache = false;
} }
if ( s.crossDomain ) { if ( s.crossDomain ) {
s.type = "GET"; s.type = "GET";
s.global = false; s.global = false;
} }
}); } );
// Bind script tag hack transport // Bind script tag hack transport
jQuery.ajaxTransport("script", function(s) { jQuery.ajaxTransport( "script", function(s) {
// This transport only deals with cross domain requests // This transport only deals with cross domain requests
if ( s.crossDomain ) { if ( s.crossDomain ) {
var script, var script,
head = document.getElementsByTagName("head")[0] || document.documentElement; head = document.getElementsByTagName( "head" )[ 0 ] || document.documentElement;
return { return {
send: function(_, callback) { send: function( _, callback ) {
script = document.createElement("script"); script = document.createElement( "script" );
script.async = "async"; script.async = "async";
@ -53,9 +48,9 @@ jQuery.ajaxTransport("script", function(s) {
script.src = s.url; script.src = s.url;
// Attach handlers for all browsers // Attach handlers for all browsers
script.onload = script.onreadystatechange = function( _ , isAbort ) { script.onload = script.onreadystatechange = function( _, isAbort ) {
if ( ! script.readyState || /loaded|complete/.test( script.readyState ) ) { if ( !script.readyState || /loaded|complete/.test( script.readyState ) ) {
// Handle memory leak in IE // Handle memory leak in IE
script.onload = script.onreadystatechange = null; script.onload = script.onreadystatechange = null;
@ -66,10 +61,10 @@ jQuery.ajaxTransport("script", function(s) {
} }
// Dereference the script // Dereference the script
script = 0; script = undefined;
// Callback if not abort // Callback if not abort
if ( ! isAbort ) { if ( !isAbort ) {
callback( 200, "success" ); callback( 200, "success" );
} }
} }
@ -81,11 +76,11 @@ jQuery.ajaxTransport("script", function(s) {
abort: function() { abort: function() {
if ( script ) { if ( script ) {
script.onload(0,1); script.onload( 0, 1 );
} }
} }
}; };
} }
}); } );
})( jQuery ); })( jQuery );

94
src/ajax/xhr.js
View file

@ -46,39 +46,38 @@ try {
jQuery.support.ajax = !!testXHR; jQuery.support.ajax = !!testXHR;
// Does this browser support crossDomain XHR requests // Does this browser support crossDomain XHR requests
jQuery.support.cors = testXHR && "withCredentials" in testXHR; jQuery.support.cors = testXHR && ( "withCredentials" in testXHR );
// No need for the temporary xhr anymore // No need for the temporary xhr anymore
testXHR = undefined; testXHR = undefined;
// Create transport if the browser can provide an xhr // Create transport if the browser can provide an xhr
if ( jQuery.support.ajax ) { if ( jQuery.support.ajax ) {
jQuery.ajaxTransport( function( s ) {
jQuery.ajaxTransport(function( s ) {
// Cross domain only allowed if supported through XMLHttpRequest // Cross domain only allowed if supported through XMLHttpRequest
if ( ! s.crossDomain || jQuery.support.cors ) { if ( !s.crossDomain || jQuery.support.cors ) {
var callback; var callback;
return { return {
send: function( headers, complete ) {
send: function(headers, complete) {
// #5280: we need to abort on unload or IE will keep connections alive // #5280: we need to abort on unload or IE will keep connections alive
if ( ! xhrUnloadAbortInstalled ) { if ( !xhrUnloadAbortInstalled ) {
xhrUnloadAbortInstalled = 1; xhrUnloadAbortInstalled = 1;
jQuery(window).bind( "unload" , function() { jQuery(window).bind( "unload", function() {
// Abort all pending requests // Abort all pending requests
jQuery.each(xhrs, function(_, xhr) { jQuery.each( xhrs, function( _, xhr ) {
if ( xhr.onreadystatechange ) { if ( xhr.onreadystatechange ) {
xhr.onreadystatechange( 1 ); xhr.onreadystatechange( 1 );
} }
}); } );
}); } );
} }
// Get a new xhr // Get a new xhr
@ -88,38 +87,36 @@ if ( jQuery.support.ajax ) {
// Open the socket // Open the socket
// Passing null username, generates a login popup on Opera (#2865) // Passing null username, generates a login popup on Opera (#2865)
if ( s.username ) { if ( s.username ) {
xhr.open(s.type, s.url, s.async, s.username, s.password); xhr.open( s.type, s.url, s.async, s.username, s.password );
} else { } else {
xhr.open(s.type, s.url, s.async); xhr.open( s.type, s.url, s.async );
} }
// Requested-With header // Requested-With header
// Not set for crossDomain requests with no content // Not set for crossDomain requests with no content
// (see why at http://trac.dojotoolkit.org/ticket/9486) // (see why at http://trac.dojotoolkit.org/ticket/9486)
// Won't change header if already provided // Won't change header if already provided
if ( ! ( s.crossDomain && ! s.hasContent ) && ! headers["x-requested-with"] ) { if ( !( s.crossDomain && !s.hasContent ) && !headers["x-requested-with"] ) {
headers["x-requested-with"] = "XMLHttpRequest"; headers[ "x-requested-with" ] = "XMLHttpRequest";
} }
// Need an extra try/catch for cross domain requests in Firefox 3 // Need an extra try/catch for cross domain requests in Firefox 3
try { try {
jQuery.each( headers, function( key, value ) {
jQuery.each(headers, function(key,value) { xhr.setRequestHeader( key, value );
xhr.setRequestHeader(key,value); } );
}); } catch( _ ) {}
} catch(_) {}
// Do send the request // Do send the request
try { try {
xhr.send( ( s.hasContent && s.data ) || null ); xhr.send( ( s.hasContent && s.data ) || null );
} catch(e) { } catch( e ) {
complete(0, "error", "" + e); complete( 0, "error", "" + e );
return; return;
} }
// Listener // Listener
callback = function( _ , isAbort ) { callback = function( _, isAbort ) {
// Was never called and is aborted or complete // Was never called and is aborted or complete
if ( callback && ( isAbort || xhr.readyState === 4 ) ) { if ( callback && ( isAbort || xhr.readyState === 4 ) ) {
@ -128,20 +125,18 @@ if ( jQuery.support.ajax ) {
callback = 0; callback = 0;
// Do not keep as active anymore // Do not keep as active anymore
if (handle) { if ( handle ) {
xhr.onreadystatechange = jQuery.noop; xhr.onreadystatechange = jQuery.noop;
delete xhrs[ handle ]; delete xhrs[ handle ];
} }
// If it's an abort // If it's an abort
if ( isAbort ) { if ( isAbort ) {
// Abort it manually if needed // Abort it manually if needed
if ( xhr.readyState !== 4 ) { if ( xhr.readyState !== 4 ) {
xhr.abort(); xhr.abort();
} }
} else { } else {
// Get info // Get info
var status = xhr.status, var status = xhr.status,
statusText, statusText,
@ -155,56 +150,51 @@ if ( jQuery.support.ajax ) {
} }
responses.text = xhr.responseText; responses.text = xhr.responseText;
try { // Firefox throws an exception when accessing statusText for faulty cross-domain requests // Firefox throws an exception when accessing
// statusText for faulty cross-domain requests
try {
statusText = xhr.statusText; statusText = xhr.statusText;
} catch( e ) { } catch( e ) {
// We normalize with Webkit giving an empty statusText
statusText = ""; // We normalize with Webkit giving an empty statusText statusText = "";
} }
// Filter status for non standard behaviours // Filter status for non standard behaviours
// (so many they seem to be the actual "standard")
status = status =
// Opera returns 0 when it should be 304 // Opera returns 0 when it should be 304
// Webkit returns 0 for failing cross-domain no matter the real status // Webkit returns 0 for failing cross-domain no matter the real status
status === 0 ? status === 0 ?
( (
! s.crossDomain || statusText ? // Webkit, Firefox: filter out faulty cross-domain requests // Webkit, Firefox: filter out faulty cross-domain requests
!s.crossDomain || statusText ?
( (
responseHeaders ? // Opera: filter out real aborts #6060 // Opera: filter out real aborts #6060
304 responseHeaders ?
: 304 :
0 0
) ) :
: // We assume 302 but could be anything cross-domain related
302 // We assume 302 but could be anything cross-domain related 302
) ) :
:
( (
status == 1223 ? // IE sometimes returns 1223 when it should be 204 (see #1450) // IE sometimes returns 1223 when it should be 204 (see #1450)
204 status == 1223 ?
: 204 :
status status
); );
// Call complete // Call complete
complete(status,statusText,responses,responseHeaders); complete( status, statusText, responses, responseHeaders );
} }
} }
}; };
// if we're in sync mode // if we're in sync mode or it's in cache
// or it's in cache and has been retrieved directly (IE6 & IE7) // and has been retrieved directly (IE6 & IE7)
// we need to manually fire the callback // we need to manually fire the callback
if ( ! s.async || xhr.readyState === 4 ) { if ( !s.async || xhr.readyState === 4 ) {
callback(); callback();
} else { } else {
// Add to list of active xhrs // Add to list of active xhrs
handle = xhrId++; handle = xhrId++;
xhrs[ handle ] = xhr; xhrs[ handle ] = xhr;