git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reworks how values of parameters passed to error callbacks are determined. Fixes...
[jquery.git]
/
src
/
ajax.js
diff --git
a/src/ajax.js
b/src/ajax.js
index
89d60e1
..
8f8bc60
100644
(file)
--- a/
src/ajax.js
+++ b/
src/ajax.js
@@
-400,8
+400,9
@@
jQuery.extend({
// Cancel the request
abort: function( statusText ) {
// Cancel the request
abort: function( statusText ) {
+ statusText = statusText || "abort";
if ( transport ) {
if ( transport ) {
- transport.abort( statusText || "abort" );
+ transport.abort( statusText );
}
done( 0, statusText );
return this;
}
done( 0, statusText );
return this;
@@
-438,7
+439,7
@@
jQuery.extend({
var isSuccess,
success,
var isSuccess,
success,
- error = ( statusText = statusText || "error" ),
+ error,
response = responses ? ajaxHandleResponses( s, jXHR, responses ) : undefined,
lastModified,
etag;
response = responses ? ajaxHandleResponses( s, jXHR, responses ) : undefined,
lastModified,
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 ( !transport ) {
// If no transport, we auto-abort
if ( !transport ) {
- done( 0, "notransport" );
+ done( -1, "No Transport" );
} else {
// Set state as sending
state = jXHR.readyState = 1;
} 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
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 );
// Simply rethrow otherwise
} else {
jQuery.error( e );