Fixes abort in prefilter. No global event will be fired in that case even if the...

[jquery.git] / src / ajax.js

diff --git a/src/ajax.js b/src/ajax.js
index 08bd9d1..e56db83 100644 (file)
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -6,8 +6,8 @@ var r20 = /%20/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,
-       // #8125, #8152: local protocol detection
-       rlocalProtocol = /^(file|chrome\-extension):$/,
+       // #7653, #8125, #8152: local protocol detection
+       rlocalProtocol = /(?:^file|^widget|\-extension):$/,
        rnoContent = /^(?:GET|HEAD)$/,
        rprotocol = /^\/\//,
        rquery = /\?/,
@@ -15,7 +15,7 @@ var r20 = /%20/g,
        rselectTextarea = /^(?:select|textarea)/i,
        rspacesAjax = /\s+/,
        rts = /([?&])_=[^&]*/,
-       rurl = /^(\w+:)\/\/([^\/?#:]+)(?::(\d+))?/,
+       rurl = /^([\w\+\.\-]+:)\/\/([^\/?#:]*)(?::(\d+))?/,
 
        // Keep a copy of the old load method
        _load = jQuery.fn.load,
@@ -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" );
                }
 
@@ -678,7 +688,7 @@ jQuery.extend({
                                // Set state as sending
                                state = jqXHR.readyState = 1;
                                // Send global event
-                               if ( s.global ) {
+                               if ( fireGlobals ) {
                                        globalEventContext.trigger( "ajaxSend", [ jqXHR, s ] );
                                }
                                // Timeout