Permalink
Browse files

Reworks how values of parameters passed to error callbacks are determ…

…ined. Fixes #8050.
  • Loading branch information...
1 parent 8d05055 commit 5ca8f0617f5c94495380ff783452a52eab706d39 @jaubourg jaubourg committed Jan 25, 2011
Showing with 60 additions and 12 deletions.
  1. +16 −6 src/ajax.js
  2. +3 −6 src/ajax/xhr.js
  3. +41 −0 test/unit/ajax.js
View
@@ -400,8 +400,9 @@ jQuery.extend({
// Cancel the request
abort: function( statusText ) {
+ statusText = statusText || "abort";
if ( transport ) {
- transport.abort( statusText || "abort" );
+ transport.abort( statusText );
}
done( 0, statusText );
return this;
@@ -438,7 +439,7 @@ jQuery.extend({
var isSuccess,
success,
- error = ( statusText = statusText || "error" ),
+ error,
response = responses ? ajaxHandleResponses( s, jXHR, responses ) : undefined,
lastModified,
etag;
@@ -476,6 +477,16 @@ jQuery.extend({
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
@@ -634,7 +645,7 @@ jQuery.extend({
// If no transport, we auto-abort
if ( !transport ) {
- done( 0, "notransport" );
+ done( -1, "No Transport" );
} else {
// Set state as sending
state = jXHR.readyState = 1;
@@ -653,9 +664,8 @@ jQuery.extend({
transport.send( requestHeaders, done );
} catch (e) {
// Propagate exception as error if not done
- if ( status === 1 ) {
- done( 0, "error", "" + e );
- jXHR = false;
+ if ( status < 2 ) {
+ done( -1, "" + e );
// Simply rethrow otherwise
} else {
jQuery.error( e );
View
@@ -108,12 +108,9 @@ if ( jQuery.support.ajax ) {
} catch( _ ) {}
// Do send the request
- try {
- xhr.send( ( s.hasContent && s.data ) || null );
- } catch( e ) {
- complete( 0, "error", "" + e );
- return;
- }
+ // This may raise an exception which is actually
+ // handled in jQuery.ajax (so no try/catch here)
+ xhr.send( ( s.hasContent && s.data ) || null );
// Listener
callback = function( _, isAbort ) {
View
@@ -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() {
expect( 1 );

0 comments on commit 5ca8f06

Please sign in to comment.