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

Ajax: add an ontimeout handler to all requests

Browse Source 
Fixes gh-3586
Close gh-3590
This commit is contained in:
Erik Lax 2017-03-23 14:33:25 +01:00 committed by Timmy Willison
parent d65bdd5fc8
commit 262acc6f1e
No known key found for this signature in database
GPG Key ID: 5F0C8B73EF56CE6F
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ajax/xhr.js
View File

@ -75,7 +75,8 @@ jQuery.ajaxTransport( function( options ) {
return function() { return function() {
if ( callback ) { if ( callback ) {
callback = errorCallback = xhr.onload = callback = errorCallback = xhr.onload =
xhr.onerror = xhr.onabort = xhr.onreadystatechange = null; xhr.onerror = xhr.onabort = xhr.ontimeout =
xhr.onreadystatechange = null;
if ( type === "abort" ) { if ( type === "abort" ) {
xhr.abort(); xhr.abort();
@ -115,7 +116,7 @@ jQuery.ajaxTransport( function( options ) {
// Listen to events // Listen to events
xhr.onload = callback(); xhr.onload = callback();
errorCallback = xhr.onerror = callback( "error" ); errorCallback = xhr.onerror = xhr.ontimeout = callback( "error" );
// Support: IE 9 only // Support: IE 9 only
// Use onreadystatechange to replace onabort // Use onreadystatechange to replace onabort

17
test/unit/ajax.js
View File

@ -527,6 +527,23 @@ QUnit.module( "ajax", {
}; };
} ); } );
ajaxTest( "jQuery.ajax() - native timeout", 2, function( assert ) {
return {
url: url( "data/name.php?wait=1" ),
xhr: function() {
var xhr = new window.XMLHttpRequest();
xhr.timeout = 1;
return xhr;
},
error: function( xhr, msg ) {
assert.strictEqual( msg, "error", "Native timeout triggers error callback" );
},
complete: function() {
assert.ok( true, "complete" );
}
};
} );
ajaxTest( "jQuery.ajax() - events with context", 12, function( assert ) { ajaxTest( "jQuery.ajax() - events with context", 12, function( assert ) {
var context = document.createElement( "div" ); var context = document.createElement( "div" );