PR for #3586 (Safari xhr timeout) #3590
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
|
mgol
requested changes
Mar 23, 2017
test/unit/ajax.js
Outdated
| @@ -527,6 +527,23 @@ QUnit.module( "ajax", { | |||
| }; | |||
| } ); | |||
|
|
|||
| ajaxTest( "jQuery.ajax() - timeout", 2, function( assert ) { | |||
There was a problem hiding this comment.
timeout -> native timeout, similarly to how the native abort test case is named.
mgol
requested changes
Mar 23, 2017
src/ajax/xhr.js
Outdated
| @@ -75,7 +75,8 @@ jQuery.ajaxTransport( function( options ) { | |||
| return function() { | |||
| if ( callback ) { | |||
| callback = errorCallback = xhr.onload = | |||
| xhr.onerror = xhr.onabort = xhr.onreadystatechange = null; | |||
| xhr.onerror = xhr.onabort = xhr.ontimeout = | |||
| xhr.onreadystatechange = null; | |||
There was a problem hiding this comment.
This should be indented by an additional tab.
There was a problem hiding this comment.
Just the last line?
|
A few nits but otherwise looks good to me! |
mgol
approved these changes
Mar 23, 2017
4 tasks
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR fixed the ontimeout callback being trigged by Safari on timeout discussed in #3586.