Ajax: Fix for request aborted in ajaxSend

Fixes gh-1775
Close gh-1619

diff --git a/src/ajax.js b/src/ajax.js
index 7a0ac1f07f057df5fd2bcc62667559491f6a42a5..d44a76095accb1d6eaa55875f4b5b915cf836aff 100644 (file)
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -644,6 +644,12 @@ jQuery.extend({
                        if ( fireGlobals ) {
                                globalEventContext.trigger( "ajaxSend", [ jqXHR, s ] );
                        }
+
+                       // If request was aborted inside ajaxSend, stop there
+                       if ( state === 2 ) {
+                               return jqXHR;
+                       }
+
                        // Timeout
                        if ( s.async && s.timeout > 0 ) {
                                timeoutTimer = setTimeout(function() {

diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index 868f19bc824a170d5eacc5dd9cf224c7e898989c..c63fd69d935b13c4c6688153af7447170ed32abc 100644 (file)
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -435,6 +435,23 @@ module( "ajax", {
                };
        });
 
+       ajaxTest( "#15160 - jQuery.ajax() - request manually aborted in ajaxSend", 3, {
+               setup: function() {
+                       jQuery( document ).on( "ajaxSend", function( e, jqXHR ) {
+                               jqXHR.abort();
+                       });
+
+                       jQuery( document ).on( "ajaxError ajaxComplete", function( e, jqXHR ) {
+                               equal( jqXHR.statusText, "abort", "jqXHR.statusText equals abort on global ajaxComplete and ajaxError events" );
+                       });
+               },
+               url: url("data/name.html"),
+               error: true,
+               complete: function() {
+                       ok( true, "complete" );
+               }
+       });
+
        ajaxTest( "jQuery.ajax() - context modification", 1, {
                url: url("data/name.html"),
                context: {},