Merge pull request #220 from fabd/fix/flashcard-review-reconnect--doe…

…snt-show (AjaxQueue): fix the Reconnect link not showing after server error 500
fabd · Nov 10, 2021 · 7796db9 · 7796db9
2 parents 5356786 + eb8bbef
commit 7796db9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/vite/src/app/legacy/ajaxqueue.js b/src/vite/src/app/legacy/ajaxqueue.js
@@ -229,7 +229,7 @@ export default class AjaxQueue {
   onAjaxFailure(o) {
     // console.log('AjaxQueue::onAjaxFailure(%o)', o);
 
-    var sErrorMessage = this.ajaxRequest.getHttpHeader(o, "RTK-Error");
+    let sErrorMessage = this.ajaxRequest.getHttpHeader(o, "RTK-Error");
 
     this.ajaxRequest = null;
 
@@ -239,14 +239,15 @@ export default class AjaxQueue {
       return;
     }
 
-    if (sErrorMessage !== null) {
+    if (sErrorMessage) {
       //alert('Oops! The server returned an error: "'+sErr500Message+'"');
 
       // show neat message from custom server-side ajax exception
       this.setErrorDialog(sErrorMessage);
     } else {
       sErrorMessage = o.status + " " + o.statusText;
-      alert('Oops! The server returned a "' + sErrorMessage + '" error.');
+      // alert('Oops! The server returned a "' + sErrorMessage + '" error.');
+      this.setErrorDialog(`Oops! Server ${o.status} ${o.statusText}.`);
     }
   }
 

diff --git a/src/vite/src/app/legacy/ajaxrequest.js b/src/vite/src/app/legacy/ajaxrequest.js
@@ -255,7 +255,7 @@ export default class AjaxRequest {
    * @param  {Object}   YUI Connect object.
    * @param  {String}   HTTP header property wanted in CamelCase
    *
-   * @return {String|Undefined}   Returns the value or undefined.
+   * @return {string|undefined}   Returns the value or undefined.
    */
   getHttpHeader(o, name) {
     return (