Skip to content
Permalink
Browse files

For much improved consistency, jqXHR.abort() sets a default statusTex…

…t of 'canceled' right until after beforeSend has been called (in which case it reverts to the default of 'abort'): now all early aborts have a statusText of 'canceled'.
  • Loading branch information...
jaubourg committed Apr 2, 2012
1 parent 395612b commit 914df9cb42219200a0286d15e0f45a9994b8ab3d
Showing with 10 additions and 6 deletions.
  1. +8 −4 src/ajax.js
  2. +2 −2 test/unit/ajax.js
@@ -426,6 +426,8 @@ jQuery.extend({
fireGlobals,
// Loop variable
i,
// Default abort message
strAbort = "canceled",
// Fake xhr
jqXHR = {

@@ -471,7 +473,7 @@ jQuery.extend({

// Cancel the request
abort: function( statusText ) {
statusText = statusText || "abort";
statusText = statusText || strAbort;
if ( transport ) {
transport.abort( statusText );
}
@@ -716,12 +718,14 @@ 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, "canceled" );
return jqXHR;
// Abort if not done already and return
return jqXHR.abort();

}

// aborting is no longer a cancelation
strAbort = "abort";

// Install callbacks on deferreds
for ( i in { success: 1, error: 1, complete: 1 } ) {
jqXHR[ i ]( s[ i ] );
@@ -895,7 +895,7 @@ test("jQuery.ajax - beforeSend, cancel request manually", function() {
ok( false, "request didn't get canceled" );
}
}).fail(function( _, reason ) {
strictEqual( reason, "abort", "manually canceled request must fail with 'abort' status text" );
strictEqual( reason, "canceled", "manually canceled request must fail with 'canceled' status text" );
});
});

@@ -2324,7 +2324,7 @@ test("jQuery.ajax - abort in prefilter", function() {
ok( false, "error callback called" );
}
}).fail(function( _, reason ) {
strictEqual( reason, 'abort', "Request aborted by the prefilter must fail with 'abort' status text" );
strictEqual( reason, 'canceled', "Request aborted by the prefilter must fail with 'canceled' status text" );
});

});

0 comments on commit 914df9c

Please sign in to comment.
You can’t perform that action at this time.