Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix ajax when loading local files on iOS web view #6610

Merged
merged 2 commits into from
Aug 15, 2018
Merged

Fix ajax when loading local files on iOS web view #6610

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4031b50
Local file ajax call statuscode can be 0 on some environments (cordov…
oscarfonts May 4, 2018
d95cac5
Include HTTP status code 0 as a valid AJAX response
oscarfonts Aug 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/util/ajax.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ export const getJSON = function(requestParameters: RequestParameters, callback:
callback(new Error(xhr.statusText));
};
xhr.onload = function() {
if (xhr.status >= 200 && xhr.status < 300 && xhr.response) {
if (((xhr.status >= 200 && xhr.status < 300) || xhr.status === 0) && xhr.response) {
let data;
try {
data = JSON.parse(xhr.response);
Expand Down Expand Up @@ -108,7 +108,7 @@ export const getArrayBuffer = function(requestParameters: RequestParameters, cal
if (response.byteLength === 0 && xhr.status === 200) {
return callback(new Error('http status 200 returned without content.'));
}
if (xhr.status >= 200 && xhr.status < 300 && xhr.response) {
if (((xhr.status >= 200 && xhr.status < 300) || xhr.status === 0) && xhr.response) {
callback(null, {
data: response,
cacheControl: xhr.getResponseHeader('Cache-Control'),
Expand Down