library-mirrors/jquery
1
0
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2024-11-23 02:54:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

For much improved consistency, jqXHR.abort() sets a default statusText 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'.

Browse Source
This commit is contained in:
jaubourg 2012-04-02 02:04:46 +02:00
parent 395612bb15
commit 914df9cb42
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/ajax.js
View File

@ -426,6 +426,8 @@ jQuery.extend({
fireGlobals, fireGlobals,
// Loop variable // Loop variable
i, i,
// Default abort message
strAbort = "canceled",
// Fake xhr // Fake xhr
jqXHR = { jqXHR = {
@ -471,7 +473,7 @@ jQuery.extend({
// Cancel the request // Cancel the request
abort: function( statusText ) { abort: function( statusText ) {
statusText = statusText || "abort"; statusText = statusText || strAbort;
if ( transport ) { if ( transport ) {
transport.abort( statusText ); transport.abort( statusText );
} }
@ -716,12 +718,14 @@ jQuery.extend({
// Allow custom headers/mimetypes and early abort // Allow custom headers/mimetypes and early abort
if ( s.beforeSend && ( s.beforeSend.call( callbackContext, jqXHR, s ) === false || state === 2 ) ) { if ( s.beforeSend && ( s.beforeSend.call( callbackContext, jqXHR, s ) === false || state === 2 ) ) {
// Abort if not done already // Abort if not done already and return
done( 0, "canceled" ); return jqXHR.abort();
return jqXHR;
} }
// aborting is no longer a cancelation
strAbort = "abort";
// Install callbacks on deferreds // Install callbacks on deferreds
for ( i in { success: 1, error: 1, complete: 1 } ) { for ( i in { success: 1, error: 1, complete: 1 } ) {
jqXHR[ i ]( s[ i ] ); jqXHR[ i ]( s[ i ] );

4
test/unit/ajax.js
View File

@ -895,7 +895,7 @@ test("jQuery.ajax - beforeSend, cancel request manually", function() {
ok( false, "request didn't get canceled" ); ok( false, "request didn't get canceled" );
} }
}).fail(function( _, reason ) { }).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" ); ok( false, "error callback called" );
} }
}).fail(function( _, reason ) { }).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" );
}); });
}); });