Skip to content

J
jquery
Commit 8f8961de authored by jaubourg's avatar jaubourg
Browse files
Options

Reformats logic for early abort in beforeSend to limit block imbrication.

parent 03bad0a9
Show whitespace changes
Inline Side-by-side
Showing with 35 additions and 36 deletions
src/ajax.js
View file @ 8f8961de
...@@ -667,11 +667,10 @@ jQuery.extend({ ...@@ -667,11 +667,10 @@ 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
done( 0, "abort" ); jqXHR.abort();
// Return false return false;
jqXHR = false;
} else { }
// 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 } ) {
...@@ -710,7 +709,7 @@ jQuery.extend({ ...@@ -710,7 +709,7 @@ jQuery.extend({
} }
} }
} }
}
return jqXHR; return jqXHR;
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment