Netsyms/HelenaExpressApp
2
0
Fork 0
Code Issues Pull Requests Releases 15 Wiki Activity

Don't silently fail when server unreachable

Browse Source
This commit is contained in:
Skylar Ittner 2021-01-23 18:45:54 -07:00
parent 83ee49942c
commit a2be153014
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
www/assets/js/rates.js
View File

@ -77,11 +77,15 @@ function getRates() {
}, },
function (xhr) { function (xhr) {
app.dialog.close(); app.dialog.close();
var error = $.parseJSON(xhr.responseText); try {
if (error && typeof error.msg != 'undefined') { var error = $.parseJSON(xhr.responseText);
app.dialog.alert(error.msg, "Error"); if (error && typeof error.msg != 'undefined') {
} else { app.dialog.alert(error.msg, "Error");
app.dialog.alert("A server or network error occurred.", "Error"); } else {
app.dialog.alert("There's a server or network problem. Check your Internet connection or try again later.", "Error");
}
} catch (ex) {
app.dialog.alert("There's a server or network problem. Check your Internet connection or try again later.", "Error");
} }
}, "GET"); }, "GET");
} }

14
www/assets/js/track.js
View File

@ -111,11 +111,15 @@ function trackOpenAsync(routeTo, routeFrom, resolve, reject) {
}, },
function (xhr) { function (xhr) {
app.dialog.close(); app.dialog.close();
var error = $.parseJSON(xhr.responseText); try {
if (error && typeof error.msg != 'undefined') { var error = $.parseJSON(xhr.responseText);
app.dialog.alert(error.msg, "Error"); if (error && typeof error.msg != 'undefined') {
} else { app.dialog.alert(error.msg, "Error");
app.dialog.alert("A server or network error occurred.", "Error"); } else {
app.dialog.alert("There's a server or network problem. Check your Internet connection or try again later.", "Error");
}
} catch (ex) {
app.dialog.alert("There's a server or network problem. Check your Internet connection or try again later.", "Error");
} }
reject(); reject();
}, "GET"); }, "GET");