maket/MaketRandevu
1
1
Fork 0
Code Issues 15 Pull requests Projects Releases 4 Packages Wiki Activity

The generic error handler callback can now display non-JSON responses (#836).

Browse source
This commit is contained in:
Alex Tselegidis 2020-08-15 15:26:26 +03:00
parent 4f1c39b564
commit 8f1e82019f
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
assets/js/general_functions.js
View file

@ -301,7 +301,13 @@ window.GeneralFunctions = window.GeneralFunctions || {};
exports.ajaxFailureHandler = function (jqXHR, textStatus, errorThrown) { exports.ajaxFailureHandler = function (jqXHR, textStatus, errorThrown) {
console.error('Unexpected HTTP Error: ', jqXHR, textStatus, errorThrown); console.error('Unexpected HTTP Error: ', jqXHR, textStatus, errorThrown);
var response = JSON.parse(jqXHR.responseText); var response;
try {
response = JSON.parse(jqXHR.responseText); // JSON response
} catch(error) {
response = { message: jqXHR.responseText }; // String response
}
if (!response) { if (!response) {
return; return;
@ -311,7 +317,7 @@ window.GeneralFunctions = window.GeneralFunctions || {};
$('<div/>', { $('<div/>', {
'class': 'well', 'class': 'well',
'text': response.message 'html': response.message || '→ No error information provided.'
}) })
.appendTo('#message_box'); .appendTo('#message_box');
}; };