Merge pull request #845 from tobser/ia7_catch_ajax_error

Always show error message on failed ajax requests
hollie · Sep 18, 2022 · de0b89e · de0b89e
2 parents 919bda9 + e14f55f
commit de0b89e
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/web/ia7/include/javascript.js b/web/ia7/include/javascript.js
@@ -2257,9 +2257,15 @@ var ajax_req_error = function(xhr, status, error, module, modal) {
      if (xhr == undefined || xhr.responseText == undefined || xhr.responseText == "") {
          message = "Lost communication with server";
      } else {
-         var data = JSON.parse(xhr.responseText);
          message = "Communication problem with server";
-         if (data !== undefined && data.text !== undefined) message = data.text;
+         try{
+             var data = JSON.parse(xhr.responseText);
+             if (data !== undefined && data.text !== undefined) message = data.text;
+         }
+         catch
+         {
+             message += `: ${xhr.status} - ${xhr.statusText}`;
+         }
      }
      console.log("Ajax Error! module="+module+" status="+status+" error="+error+" msg="+message);