Improve error message

closes #600
- replaced '?' with 'Server was not available'
- added request.statusText
This commit is contained in:
Sebastian Gierlinger 2013-09-16 10:16:42 +02:00
parent 881e861295
commit d5b197656b

View File

@ -81,7 +81,8 @@
// Used in API request fail handlers to parse a standard api error // Used in API request fail handlers to parse a standard api error
// response json for the message to display // response json for the message to display
getRequestErrorMessage: function (request) { getRequestErrorMessage: function (request) {
var message; var message,
msgDetail;
// Can't really continue without a request // Can't really continue without a request
if (!request) { if (!request) {
@ -97,7 +98,8 @@
// Try to parse out the error, or default to "Unknown" // Try to parse out the error, or default to "Unknown"
message = request.responseJSON.error || "Unknown Error"; message = request.responseJSON.error || "Unknown Error";
} catch (e) { } catch (e) {
message = "The server returned an error (" + (request.status || "?") + ")."; msgDetail = request.status ? request.status + " - " + request.statusText : "Server was not available";
message = "The server returned an error (" + msgDetail + ").";
} }
} }