Reformats logic for early abort in beforeSend to limit block imbrication.

[jquery.git] / src / ajax.js

diff --git a/src/ajax.js b/src/ajax.js
index ce27d2d..4830e3d 100644 (file)
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -7,7 +7,7 @@ var r20 = /%20/g,
        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,
        // #7653, #8125, #8152: local protocol detection
-       rlocalProtocol = /(?:^file|\-extension):$/,
+       rlocalProtocol = /(?:^file|^widget|\-extension):$/,
        rnoContent = /^(?:GET|HEAD)$/,
        rprotocol = /^\/\//,
        rquery = /\?/,
@@ -113,9 +113,9 @@ function inspectPrefiltersOrTransports( structure, options, originalOptions, jqX
        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
+               // we try there if executing only and not done already
                if ( typeof selection === "string" ) {
-                       if ( inspected[ selection ] ) {
+                       if ( !executeOnly || inspected[ selection ] ) {
                                selection = undefined;
                        } else {
                                options.dataTypes.unshift( selection );
@@ -388,6 +388,8 @@ jQuery.extend({
                        parts,
                        // The jqXHR state
                        state = 0,
+                       // To know if global events are to be dispatched
+                       fireGlobals,
                        // Loop variable
                        i,
                        // Fake xhr
@@ -529,7 +531,7 @@ jQuery.extend({
                        jqXHR.statusCode( statusCode );
                        statusCode = undefined;
 
-                       if ( s.global ) {
+                       if ( fireGlobals ) {
                                globalEventContext.trigger( "ajax" + ( isSuccess ? "Success" : "Error" ),
                                                [ jqXHR, s, isSuccess ? success : error ] );
                        }
@@ -537,7 +539,7 @@ jQuery.extend({
                        // Complete
                        completeDeferred.resolveWith( callbackContext, [ jqXHR, statusText ] );
 
-                       if ( s.global ) {
+                       if ( fireGlobals ) {
                                globalEventContext.trigger( "ajaxComplete", [ jqXHR, s] );
                                // Handle the global AJAX counter
                                if ( !( --jQuery.active ) ) {
@@ -594,6 +596,14 @@ jQuery.extend({
                // Apply prefilters
                inspectPrefiltersOrTransports( prefilters, s, options, jqXHR );
 
+               // If request was aborted inside a prefiler, stop there
+               if ( state === 2 ) {
+                       return false;
+               }
+
+               // We can fire global events as of now if asked to
+               fireGlobals = s.global;
+
                // Uppercase the type
                s.type = s.type.toUpperCase();
 
@@ -601,7 +611,7 @@ jQuery.extend({
                s.hasContent = !rnoContent.test( s.type );
 
                // Watch for a new set of requests
-               if ( s.global && jQuery.active++ === 0 ) {
+               if ( fireGlobals && jQuery.active++ === 0 ) {
                        jQuery.event.trigger( "ajaxStart" );
                }
 
@@ -657,50 +667,49 @@ jQuery.extend({
                // Allow custom headers/mimetypes and early abort
                if ( s.beforeSend && ( s.beforeSend.call( callbackContext, jqXHR, s ) === false || state === 2 ) ) {
                                // Abort if not done already
-                               done( 0, "abort" );
-                               // Return false
-                               jqXHR = false;
+                               jqXHR.abort();
+                               return false;
 
-               } else {
+               }
 
-                       // Install callbacks on deferreds
-                       for ( i in { success: 1, error: 1, complete: 1 } ) {
-                               jqXHR[ i ]( s[ i ] );
-                       }
+               // Install callbacks on deferreds
+               for ( i in { success: 1, error: 1, complete: 1 } ) {
+                       jqXHR[ i ]( s[ i ] );
+               }
 
-                       // Get transport
-                       transport = inspectPrefiltersOrTransports( transports, s, options, jqXHR );
+               // Get transport
+               transport = inspectPrefiltersOrTransports( transports, s, options, jqXHR );
 
-                       // If no transport, we auto-abort
-                       if ( !transport ) {
-                               done( -1, "No Transport" );
-                       } else {
-                               // Set state as sending
-                               state = jqXHR.readyState = 1;
-                               // Send global event
-                               if ( s.global ) {
-                                       globalEventContext.trigger( "ajaxSend", [ jqXHR, s ] );
-                               }
-                               // Timeout
-                               if ( s.async && s.timeout > 0 ) {
-                                       timeoutTimer = setTimeout( function(){
-                                               jqXHR.abort( "timeout" );
-                                       }, s.timeout );
-                               }
+               // If no transport, we auto-abort
+               if ( !transport ) {
+                       done( -1, "No Transport" );
+               } else {
+                       // Set state as sending
+                       state = jqXHR.readyState = 1;
+                       // Send global event
+                       if ( fireGlobals ) {
+                               globalEventContext.trigger( "ajaxSend", [ jqXHR, s ] );
+                       }
+                       // Timeout
+                       if ( s.async && s.timeout > 0 ) {
+                               timeoutTimer = setTimeout( function(){
+                                       jqXHR.abort( "timeout" );
+                               }, s.timeout );
+                       }
 
-                               try {
-                                       transport.send( requestHeaders, done );
-                               } catch (e) {
-                                       // Propagate exception as error if not done
-                                       if ( status < 2 ) {
-                                               done( -1, e );
-                                       // Simply rethrow otherwise
-                                       } else {
-                                               jQuery.error( e );
-                                       }
+                       try {
+                               transport.send( requestHeaders, done );
+                       } catch (e) {
+                               // Propagate exception as error if not done
+                               if ( status < 2 ) {
+                                       done( -1, e );
+                               // Simply rethrow otherwise
+                               } else {
+                                       jQuery.error( e );
                                }
                        }
                }
+
                return jqXHR;
        },