From: jaubourg Date: Sun, 23 Jan 2011 04:51:41 +0000 (+0100) Subject: Apply JQuery Core Style Guidelines to ajax.js and ajax/*.js, X-Git-Url: http://git.asbjorn.it/?p=jquery.git;a=commitdiff_plain;h=dd5bf421225d23bc8732a92ea82049859c0cd57a Apply JQuery Core Style Guidelines to ajax.js and ajax/*.js, --- diff --git a/src/ajax.js b/src/ajax.js index 74c3005..470e022 100644 --- a/src/ajax.js +++ b/src/ajax.js @@ -20,20 +20,22 @@ var r20 = /%20/g, // Keep a copy of the old load method _load = jQuery.fn.load, - // 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 + * 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 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 = {}; jQuery.fn.extend({ @@ -46,10 +48,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 @@ -105,7 +107,7 @@ jQuery.fn.extend({ } if ( callback ) { - self.each( callback, [responseText, status, jXHR] ); + self.each( callback, [ responseText, status, jXHR ] ); } } }); @@ -114,42 +116,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; @@ -164,16 +166,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 ) { @@ -240,16 +242,16 @@ jQuery.extend({ } }, - ajaxPrefilter: function( a , b ) { - prefiltersOrTransports( prefilters , a , b ); + ajaxPrefilter: function( a, b ) { + prefiltersOrTransports( prefilters, a, b ); }, - ajaxTransport: function( a , b ) { - return prefiltersOrTransports( transports , a , b ); + ajaxTransport: function( a, b ) { + return prefiltersOrTransports( transports, a, b ); }, // Main method - ajax: function( url , options ) { + ajax: function( url, options ) { // If options is not an object, // we simulate pre-1.5 signature @@ -262,7 +264,7 @@ jQuery.extend({ options = options || {}; var // Create the final options object - s = jQuery.extend( true , {} , jQuery.ajaxSettings , options ), + s = jQuery.extend( true, {}, jQuery.ajaxSettings, options ), // Callbacks contexts // We force the original context if it exists // or take it from jQuery.ajaxSettings otherwise @@ -298,7 +300,7 @@ jQuery.extend({ readyState: 0, // Caches the header - setRequestHeader: function(name,value) { + setRequestHeader: function( name, value ) { if ( state === 0 ) { requestHeaders[ name.toLowerCase() ] = value; } @@ -317,7 +319,7 @@ jQuery.extend({ if ( !responseHeaders ) { responseHeaders = {}; while( ( match = rheaders.exec( responseHeadersString ) ) ) { - responseHeaders[ match[ 1 ].toLowerCase() ] = match[ 2 ]; + responseHeaders[ match[1].toLowerCase() ] = match[ 2 ]; } } match = responseHeaders[ key.toLowerCase() ]; @@ -330,7 +332,7 @@ jQuery.extend({ if ( transport ) { transport.abort( statusText || "abort" ); } - done( 0 , statusText ); + done( 0, statusText ); return this; } }; @@ -338,7 +340,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 ) { @@ -350,7 +352,7 @@ jQuery.extend({ // Clear timeout if it exists if ( timeoutTimer ) { - clearTimeout(timeoutTimer); + clearTimeout( timeoutTimer ); } // Dereference transport for early garbage collection @@ -366,7 +368,7 @@ jQuery.extend({ var isSuccess, success, error = ( statusText = statusText || "error" ), - response = responses ? ajaxHandleResponses( s , jXHR , responses ) : undefined, + response = responses ? ajaxHandleResponses( s, jXHR, responses ) : undefined, lastModified, etag; @@ -376,10 +378,10 @@ jQuery.extend({ // Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode. if ( s.ifModified ) { - if ( ( lastModified = jXHR.getResponseHeader("Last-Modified") ) ) { + if ( ( lastModified = jXHR.getResponseHeader( "Last-Modified" ) ) ) { jQuery.lastModified[ s.url ] = lastModified; } - if ( ( etag = jXHR.getResponseHeader("Etag") ) ) { + if ( ( etag = jXHR.getResponseHeader( "Etag" ) ) ) { jQuery.etag[ s.url ] = etag; } } @@ -394,7 +396,7 @@ jQuery.extend({ } else { try { - success = ajaxConvert( s , response ); + success = ajaxConvert( s, response ); statusText = "success"; isSuccess = true; } catch(e) { @@ -411,9 +413,9 @@ jQuery.extend({ // Success/Error if ( isSuccess ) { - deferred.resolveWith( callbackContext , [ success , statusText , jXHR ] ); + deferred.resolveWith( callbackContext, [ success, statusText, jXHR ] ); } else { - deferred.rejectWith( callbackContext , [ jXHR , statusText , error ] ); + deferred.rejectWith( callbackContext, [ jXHR, statusText, error ] ); } // Status-dependent callbacks @@ -422,14 +424,14 @@ jQuery.extend({ if ( s.global ) { globalEventContext.trigger( "ajax" + ( isSuccess ? "Success" : "Error" ) , - [ jXHR , s , isSuccess ? success : error ] ); + [ jXHR, s, isSuccess ? success : error ] ); } // Complete - completeDeferred.resolveWith( callbackContext, [ jXHR , statusText ] ); + completeDeferred.resolveWith( callbackContext, [ jXHR, statusText ] ); if ( s.global ) { - globalEventContext.trigger( "ajaxComplete" , [ jXHR , s] ); + globalEventContext.trigger( "ajaxComplete", [ jXHR, s] ); // Handle the global AJAX counter if ( ! --jQuery.active ) { jQuery.event.trigger( "ajaxStop" ); @@ -449,7 +451,7 @@ jQuery.extend({ var tmp; if ( state < 2 ) { for( tmp in map ) { - statusCode[ tmp ] = [ statusCode[ tmp ] , map[ tmp ] ]; + statusCode[ tmp ] = [ statusCode[tmp], map[tmp] ]; } } else { tmp = map[ jXHR.status ]; @@ -461,13 +463,13 @@ jQuery.extend({ // Remove hash character (#7531: and string promotion) // 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 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 && @@ -480,17 +482,17 @@ jQuery.extend({ // 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 ); + jQuery.ajaxPrefilter( s, options ); // 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 ) { @@ -498,7 +500,7 @@ 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 ) { @@ -510,10 +512,10 @@ jQuery.extend({ 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 : "" ); } } @@ -533,8 +535,8 @@ jQuery.extend({ } // 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 @@ -543,11 +545,9 @@ 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, jXHR, s ) === false || state === 2 ) ) { // Abort if not done already - done( 0 , "abort" ); - + done( 0, "abort" ); // Return false jXHR = false; @@ -559,43 +559,39 @@ jQuery.extend({ } // Get transport - transport = jQuery.ajaxTransport( s , options ); + transport = jQuery.ajaxTransport( s, options ); // If no transport, we auto-abort - if ( ! transport ) { - done( 0 , "notransport" ); + if ( !transport ) { + done( 0, "notransport" ); } else { - // Set state as sending state = jXHR.readyState = 1; - // Send global event if ( s.global ) { - globalEventContext.trigger( "ajaxSend" , [ jXHR , s ] ); + globalEventContext.trigger( "ajaxSend", [ jXHR, s ] ); } - // Timeout if ( s.async && s.timeout > 0 ) { - timeoutTimer = setTimeout(function(){ + timeoutTimer = setTimeout( function(){ jXHR.abort( "timeout" ); - }, s.timeout); + }, s.timeout ); } 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); + done( 0, "error", "" + e ); jXHR = false; // Simply rethrow otherwise } else { - jQuery.error(e); + jQuery.error( e ); } } } } - return jXHR; }, @@ -605,8 +601,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. @@ -615,27 +611,27 @@ 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 ) { // 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, "+" ); } }); 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 ) ) { @@ -687,12 +683,12 @@ jQuery.extend({ }); // 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 || {}; - if ( ! tested[ dataType ] ) { + if ( !tested[ dataType ] ) { tested[ dataType ] = true; @@ -702,14 +698,14 @@ function inspectPrefiltersOrTransports( structure , options , originalOptions , executeOnly = structure === prefilters, selected; - for( ; ( executeOnly || ! selected ) && i < length ; i++ ) { - selected = list[ i ]( options , originalOptions ); + for(; ( 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 = inspectPrefiltersOrTransports( - structure , options , originalOptions , selected , tested ); + structure, options, originalOptions, selected, tested ); // We always break in order not to continue // to iterate in previous list break; @@ -717,9 +713,9 @@ function inspectPrefiltersOrTransports( structure , options , originalOptions , } // If we're only executing or nothing was selected // we try the catchall dataType - if ( ! tested[ "*" ] && ( executeOnly || ! selected ) ) { + if ( !tested[ "*" ] && ( executeOnly || ! selected ) ) { selected = inspectPrefiltersOrTransports( - structure , options , originalOptions , "*" , tested ); + structure, options, originalOptions, "*" ,tested ); } // This will be ignored by ajaxPrefilter // 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 ), i = 0, @@ -737,7 +733,7 @@ function addToPrefiltersOrTransports( structure , dataTypeExpression , functor ) placeBefore; // For each dataType in the dataTypeExpression - for( ; i < length ; i++ ) { + for(; i < length; i++ ) { dataType = dataTypes[ i ]; // We control if we're asked to add before // any existing element @@ -752,13 +748,13 @@ function addToPrefiltersOrTransports( structure , dataTypeExpression , functor ) } // 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 ); if ( type === "object" ) { // We have an options map so we have to inspect the structure - return inspectPrefiltersOrTransports( structure , arg1 , arg2 ); + return inspectPrefiltersOrTransports( structure, arg1, arg2 ); } else { // We're requested to add to the structure // 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 if ( type || jQuery.isFunction( arg2 ) ) { - addToPrefiltersOrTransports( structure , arg1 || "*" , arg2 ); + addToPrefiltersOrTransports( structure, arg1 || "*", arg2 ); } } } -// Handles responses to an ajax request: -// - sets all responseXXX fields accordingly -// - finds the right dataType (mediating between content-type and expecting dataType) -// - returns the corresponding response -function ajaxHandleResponses( s , jXHR , responses ) { +/* 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, jXHR, responses ) { var contents = s.contents, dataTypes = s.dataTypes, @@ -793,12 +790,12 @@ function ajaxHandleResponses( s , jXHR , responses ) { // Fill responseXXX fields for( type in responseFields ) { if ( type in responses ) { - jXHR[ responseFields[ type ] ] = responses[ type ]; + jXHR[ responseFields[type] ] = responses[ type ]; } } // Remove auto dataType and get content-type in the process - while( dataTypes[0] === "*" ) { + while( dataTypes[ 0 ] === "*" ) { dataTypes.shift(); if ( ct === undefined ) { 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 - if ( dataTypes[0] in responses ) { - finalDataType = dataTypes[0]; + if ( dataTypes[ 0 ] in responses ) { + finalDataType = dataTypes[ 0 ]; } else { // Try convertible dataTypes for ( type in responses ) { - if ( ! dataTypes[0] || s.converters[ type + " " + dataTypes[0] ] ) { + if ( ! dataTypes[ 0 ] || s.converters[ type + " " + dataTypes[0] ] ) { finalDataType = type; break; } @@ -837,7 +834,7 @@ function ajaxHandleResponses( s , jXHR , responses ) { // We add the dataType to the list if needed // and return the corresponding response if ( finalDataType ) { - if ( finalDataType !== dataTypes[0] ) { + if ( finalDataType !== dataTypes[ 0 ] ) { dataTypes.unshift( finalDataType ); } return responses[ finalDataType ]; @@ -845,11 +842,11 @@ function ajaxHandleResponses( s , jXHR , responses ) { } // Chain conversions given the request and the original response -function ajaxConvert( s , response ) { +function ajaxConvert( s, response ) { // Apply the dataFilter if provided if ( s.dataFilter ) { - response = s.dataFilter( response , s.dataType ); + response = s.dataFilter( response, s.dataType ); } var dataTypes = s.dataTypes, @@ -858,7 +855,7 @@ function ajaxConvert( s , response ) { length = dataTypes.length, tmp, // Current and previous dataTypes - current = dataTypes[0], + current = dataTypes[ 0 ], prev, // Conversion expression conversion, @@ -869,7 +866,7 @@ function ajaxConvert( s , response ) { conv2; // For each dataType in the chain - for( i = 1 ; i < length ; i++ ) { + for( i = 1; i < length; i++ ) { // Get the dataTypes prev = current; @@ -891,7 +888,7 @@ function ajaxConvert( s , response ) { for( conv1 in converters ) { tmp = conv1.split( " " ); if ( tmp[ 0 ] === prev || tmp[ 0 ] === "*" ) { - conv2 = converters[ tmp[ 1 ] + " " + current ]; + conv2 = converters[ tmp[1] + " " + current ]; if ( conv2 ) { conv1 = converters[ conv1 ]; if ( conv1 === true ) { @@ -906,16 +903,15 @@ function ajaxConvert( s , response ) { } // If we found no converter, dispatch an error 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 ( conv !== true ) { // Convert with 1 or 2 converters accordingly - response = conv ? conv( response ) : conv2( conv1( response ) ); + response = conv ? conv( response ) : conv2( conv1(response) ); } } } - return response; } diff --git a/src/ajax/jsonp.js b/src/ajax/jsonp.js index ff8d1f1..0588475 100644 --- a/src/ajax/jsonp.js +++ b/src/ajax/jsonp.js @@ -13,9 +13,9 @@ jQuery.ajaxSetup({ // Detect, normalize options and install callbacks for jsonp requests // (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" || originalSettings.jsonpCallback || @@ -47,23 +47,25 @@ jQuery.ajaxPrefilter("json jsonp", function(s, originalSettings, dataIsString) { s.url = url; s.data = data; - window [ jsonpCallback ] = function( response ) { - responseContainer = [response]; + window[ jsonpCallback ] = function( response ) { + responseContainer = [ response ]; }; - s.complete = [function() { + s.complete = [ function() { // Set callback back to previous value window[ jsonpCallback ] = previous; // Call if it was a function and we have a response if ( previous) { - if ( responseContainer && jQuery.isFunction ( previous ) ) { - window[ jsonpCallback ] ( responseContainer[0] ); + if ( responseContainer && jQuery.isFunction( previous ) ) { + window[ jsonpCallback ] ( responseContainer[ 0 ] ); } } else { // else, more memory leak avoidance - try{ delete window[ jsonpCallback ]; } catch(e){} + try{ + delete window[ jsonpCallback ]; + } catch( e ) {} } }, s.complete ]; @@ -82,6 +84,6 @@ jQuery.ajaxPrefilter("json jsonp", function(s, originalSettings, dataIsString) { // Delegate to script return "script"; } -}); +} ); })( jQuery ); diff --git a/src/ajax/script.js b/src/ajax/script.js index bdf69dd..37bd85b 100644 --- a/src/ajax/script.js +++ b/src/ajax/script.js @@ -2,47 +2,42 @@ // Install script dataType jQuery.ajaxSetup({ - accepts: { script: "text/javascript, application/javascript" }, - contents: { script: /javascript/ }, - converters: { "text script": jQuery.globalEval } }); // Handle cache's special case and global -jQuery.ajaxPrefilter("script", function(s) { - +jQuery.ajaxPrefilter( "script", function(s) { if ( s.cache === undefined ) { s.cache = false; } - if ( s.crossDomain ) { s.type = "GET"; s.global = false; } -}); +} ); // Bind script tag hack transport -jQuery.ajaxTransport("script", function(s) { +jQuery.ajaxTransport( "script", function(s) { // This transport only deals with cross domain requests if ( s.crossDomain ) { var script, - head = document.getElementsByTagName("head")[0] || document.documentElement; + head = document.getElementsByTagName( "head" )[ 0 ] || document.documentElement; return { - send: function(_, callback) { + send: function( _, callback ) { - script = document.createElement("script"); + script = document.createElement( "script" ); script.async = "async"; @@ -53,9 +48,9 @@ jQuery.ajaxTransport("script", function(s) { script.src = s.url; // 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 script.onload = script.onreadystatechange = null; @@ -66,10 +61,10 @@ jQuery.ajaxTransport("script", function(s) { } // Dereference the script - script = 0; + script = undefined; // Callback if not abort - if ( ! isAbort ) { + if ( !isAbort ) { callback( 200, "success" ); } } @@ -81,11 +76,11 @@ jQuery.ajaxTransport("script", function(s) { abort: function() { if ( script ) { - script.onload(0,1); + script.onload( 0, 1 ); } } }; } -}); +} ); })( jQuery ); diff --git a/src/ajax/xhr.js b/src/ajax/xhr.js index 7a4da2d..5629dcd 100644 --- a/src/ajax/xhr.js +++ b/src/ajax/xhr.js @@ -46,39 +46,38 @@ try { jQuery.support.ajax = !!testXHR; // 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 testXHR = undefined; // Create transport if the browser can provide an xhr if ( jQuery.support.ajax ) { - jQuery.ajaxTransport( function( s ) { + jQuery.ajaxTransport(function( s ) { // Cross domain only allowed if supported through XMLHttpRequest - if ( ! s.crossDomain || jQuery.support.cors ) { + if ( !s.crossDomain || jQuery.support.cors ) { var callback; return { - - send: function(headers, complete) { + send: function( headers, complete ) { // #5280: we need to abort on unload or IE will keep connections alive - if ( ! xhrUnloadAbortInstalled ) { + if ( !xhrUnloadAbortInstalled ) { xhrUnloadAbortInstalled = 1; - jQuery(window).bind( "unload" , function() { + jQuery(window).bind( "unload", function() { // Abort all pending requests - jQuery.each(xhrs, function(_, xhr) { + jQuery.each( xhrs, function( _, xhr ) { if ( xhr.onreadystatechange ) { xhr.onreadystatechange( 1 ); } - }); + } ); - }); + } ); } // Get a new xhr @@ -88,38 +87,36 @@ if ( jQuery.support.ajax ) { // Open the socket // Passing null username, generates a login popup on Opera (#2865) 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 { - xhr.open(s.type, s.url, s.async); + xhr.open( s.type, s.url, s.async ); } // Requested-With header // Not set for crossDomain requests with no content // (see why at http://trac.dojotoolkit.org/ticket/9486) // Won't change header if already provided - if ( ! ( s.crossDomain && ! s.hasContent ) && ! headers["x-requested-with"] ) { - headers["x-requested-with"] = "XMLHttpRequest"; + if ( !( s.crossDomain && !s.hasContent ) && !headers["x-requested-with"] ) { + headers[ "x-requested-with" ] = "XMLHttpRequest"; } // Need an extra try/catch for cross domain requests in Firefox 3 try { - - jQuery.each(headers, function(key,value) { - xhr.setRequestHeader(key,value); - }); - - } catch(_) {} + jQuery.each( headers, function( key, value ) { + xhr.setRequestHeader( key, value ); + } ); + } catch( _ ) {} // Do send the request try { xhr.send( ( s.hasContent && s.data ) || null ); - } catch(e) { - complete(0, "error", "" + e); + } catch( e ) { + complete( 0, "error", "" + e ); return; } // Listener - callback = function( _ , isAbort ) { + callback = function( _, isAbort ) { // Was never called and is aborted or complete if ( callback && ( isAbort || xhr.readyState === 4 ) ) { @@ -128,20 +125,18 @@ if ( jQuery.support.ajax ) { callback = 0; // Do not keep as active anymore - if (handle) { + if ( handle ) { xhr.onreadystatechange = jQuery.noop; delete xhrs[ handle ]; } // If it's an abort if ( isAbort ) { - // Abort it manually if needed if ( xhr.readyState !== 4 ) { xhr.abort(); } } else { - // Get info var status = xhr.status, statusText, @@ -155,56 +150,51 @@ if ( jQuery.support.ajax ) { } 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; - } catch( e ) { - - statusText = ""; // We normalize with Webkit giving an empty statusText - + // We normalize with Webkit giving an empty statusText + statusText = ""; } // Filter status for non standard behaviours - // (so many they seem to be the actual "standard") status = // Opera returns 0 when it should be 304 // Webkit returns 0 for failing cross-domain no matter the real status 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 - 304 - : + // Opera: filter out real aborts #6060 + responseHeaders ? + 304 : 0 - ) - : - 302 // We assume 302 but could be anything cross-domain related - ) - : + ) : + // We assume 302 but could be anything cross-domain related + 302 + ) : ( - status == 1223 ? // IE sometimes returns 1223 when it should be 204 (see #1450) - 204 - : + // IE sometimes returns 1223 when it should be 204 (see #1450) + status == 1223 ? + 204 : status ); // Call complete - complete(status,statusText,responses,responseHeaders); + complete( status, statusText, responses, responseHeaders ); } } }; - // if we're in sync mode - // or it's in cache and has been retrieved directly (IE6 & IE7) + // if we're in sync mode or it's in cache + // and has been retrieved directly (IE6 & IE7) // we need to manually fire the callback - if ( ! s.async || xhr.readyState === 4 ) { - + if ( !s.async || xhr.readyState === 4 ) { callback(); - } else { - // Add to list of active xhrs handle = xhrId++; xhrs[ handle ] = xhr;