From 8f1e82019fdc95eb30861d44aebcba06d0f1fbbf Mon Sep 17 00:00:00 2001
From: Alex Tselegidis <alextselegidis@gmail.com>
Date: Sat, 15 Aug 2020 15:26:26 +0300
Subject: [PATCH] The generic error handler callback can now display non-JSON
 responses (#836).

---
 assets/js/general_functions.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/assets/js/general_functions.js b/assets/js/general_functions.js
index 2f2eab0a..a4ae173b 100755
--- a/assets/js/general_functions.js
+++ b/assets/js/general_functions.js
@@ -301,7 +301,13 @@ window.GeneralFunctions = window.GeneralFunctions || {};
     exports.ajaxFailureHandler = function (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) {
             return;
@@ -311,7 +317,7 @@ window.GeneralFunctions = window.GeneralFunctions || {};
 
         $('<div/>', {
             'class': 'well',
-            'text': response.message
+            'html': response.message || '→ No error information provided.'
         })
             .appendTo('#message_box');
     };