Reworks how values of parameters passed to error callbacks are determined. Fixes #8050.
This commit is contained in:
parent
8d050558d3
commit
5ca8f0617f
22
src/ajax.js
22
src/ajax.js
|
@ -400,8 +400,9 @@ jQuery.extend({
|
||||||
|
|
||||||
// Cancel the request
|
// Cancel the request
|
||||||
abort: function( statusText ) {
|
abort: function( statusText ) {
|
||||||
|
statusText = statusText || "abort";
|
||||||
if ( transport ) {
|
if ( transport ) {
|
||||||
transport.abort( statusText || "abort" );
|
transport.abort( statusText );
|
||||||
}
|
}
|
||||||
done( 0, statusText );
|
done( 0, statusText );
|
||||||
return this;
|
return this;
|
||||||
|
@ -438,7 +439,7 @@ jQuery.extend({
|
||||||
|
|
||||||
var isSuccess,
|
var isSuccess,
|
||||||
success,
|
success,
|
||||||
error = ( statusText = statusText || "error" ),
|
error,
|
||||||
response = responses ? ajaxHandleResponses( s, jXHR, responses ) : undefined,
|
response = responses ? ajaxHandleResponses( s, jXHR, responses ) : undefined,
|
||||||
lastModified,
|
lastModified,
|
||||||
etag;
|
etag;
|
||||||
|
@ -476,6 +477,16 @@ jQuery.extend({
|
||||||
error = "" + e;
|
error = "" + e;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
// We extract error from statusText
|
||||||
|
// then normalize statusText and status for non-aborts
|
||||||
|
error = statusText;
|
||||||
|
if( status ) {
|
||||||
|
statusText = "error";
|
||||||
|
if ( status < 0 ) {
|
||||||
|
status = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Set data for the fake xhr object
|
// Set data for the fake xhr object
|
||||||
|
@ -634,7 +645,7 @@ jQuery.extend({
|
||||||
|
|
||||||
// If no transport, we auto-abort
|
// If no transport, we auto-abort
|
||||||
if ( !transport ) {
|
if ( !transport ) {
|
||||||
done( 0, "notransport" );
|
done( -1, "No Transport" );
|
||||||
} else {
|
} else {
|
||||||
// Set state as sending
|
// Set state as sending
|
||||||
state = jXHR.readyState = 1;
|
state = jXHR.readyState = 1;
|
||||||
|
@ -653,9 +664,8 @@ jQuery.extend({
|
||||||
transport.send( requestHeaders, done );
|
transport.send( requestHeaders, done );
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
// Propagate exception as error if not done
|
// Propagate exception as error if not done
|
||||||
if ( status === 1 ) {
|
if ( status < 2 ) {
|
||||||
done( 0, "error", "" + e );
|
done( -1, "" + e );
|
||||||
jXHR = false;
|
|
||||||
// Simply rethrow otherwise
|
// Simply rethrow otherwise
|
||||||
} else {
|
} else {
|
||||||
jQuery.error( e );
|
jQuery.error( e );
|
||||||
|
|
|
@ -108,12 +108,9 @@ if ( jQuery.support.ajax ) {
|
||||||
} catch( _ ) {}
|
} catch( _ ) {}
|
||||||
|
|
||||||
// Do send the request
|
// Do send the request
|
||||||
try {
|
// This may raise an exception which is actually
|
||||||
xhr.send( ( s.hasContent && s.data ) || null );
|
// handled in jQuery.ajax (so no try/catch here)
|
||||||
} catch( e ) {
|
xhr.send( ( s.hasContent && s.data ) || null );
|
||||||
complete( 0, "error", "" + e );
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Listener
|
// Listener
|
||||||
callback = function( _, isAbort ) {
|
callback = function( _, isAbort ) {
|
||||||
|
|
|
@ -240,6 +240,47 @@ test("jQuery.ajax() - error callbacks", function() {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test("jQuery.ajax() - textStatus and errorThrown values", function() {
|
||||||
|
|
||||||
|
var nb = 3;
|
||||||
|
|
||||||
|
expect( 2 * nb );
|
||||||
|
stop();
|
||||||
|
|
||||||
|
function startN() {
|
||||||
|
if ( !( --nb ) ) {
|
||||||
|
start();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
jQuery.ajax({
|
||||||
|
url: url("data/nonExistingURL"),
|
||||||
|
error: function( _ , textStatus , errorThrown ){
|
||||||
|
strictEqual( textStatus, "error", "textStatus is 'error' for 404" );
|
||||||
|
strictEqual( errorThrown, "Not Found", "errorThrown is 'Not Found' for 404");
|
||||||
|
startN();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
jQuery.ajax({
|
||||||
|
url: url("data/name.php?wait=5"),
|
||||||
|
error: function( _ , textStatus , errorThrown ){
|
||||||
|
strictEqual( textStatus, "abort", "textStatus is 'abort' for abort" );
|
||||||
|
strictEqual( errorThrown, "abort", "errorThrown is 'abort' for abort");
|
||||||
|
startN();
|
||||||
|
}
|
||||||
|
}).abort();
|
||||||
|
|
||||||
|
jQuery.ajax({
|
||||||
|
url: url("data/name.php?wait=5"),
|
||||||
|
error: function( _ , textStatus , errorThrown ){
|
||||||
|
strictEqual( textStatus, "mystatus", "textStatus is 'mystatus' for abort('mystatus')" );
|
||||||
|
strictEqual( errorThrown, "mystatus", "errorThrown is 'mystatus' for abort('mystatus')");
|
||||||
|
startN();
|
||||||
|
}
|
||||||
|
}).abort( "mystatus" );
|
||||||
|
});
|
||||||
|
|
||||||
test("jQuery.ajax() - responseText on error", function() {
|
test("jQuery.ajax() - responseText on error", function() {
|
||||||
|
|
||||||
expect( 1 );
|
expect( 1 );
|
||||||
|
|
Loading…
Reference in a new issue