Display error message after encountering ajax error in popover (#14424)

* Display error message after encountering ajax error in popover

* Remove timeout

* Remove check for non-500 errors (e.g. Exceptions) as it doesn't appear to be needed any more

* Sanitise error page HTML before displaying it

1 files changed, 13 insertions, 6 deletions

diff --git a/plugins/Morpheus/javascripts/ajaxHelper.js b/plugins/Morpheus/javascripts/ajaxHelper.js
index c5b91ff3ab..9f1d944849 100644
--- a/plugins/Morpheus/javascripts/ajaxHelper.js
+++ b/plugins/Morpheus/javascripts/ajaxHelper.js
@@ -97,7 +97,7 @@ function ajaxHelper() {
     /**
      * Callback function to be executed on error
      */
-    this.errorCallback =  this.defaultErrorCallback;
+    this.errorCallback;
 
     this.withToken = false;
 
@@ -279,11 +279,18 @@ function ajaxHelper() {
         if(status == 'abort') {
             return;
         }
-        $('#loadingError').show();
-        setTimeout( function(){
-            $('#loadingError').fadeOut('slow');
-        }, 2000);
-    };
+
+        var loadingError = $('#loadingError');
+        if (Piwik_Popover.isOpen() && deferred && deferred.status === 500) {
+            if (deferred && deferred.status === 500) {
+                $(document.body).html(piwikHelper.escape(deferred.responseText));
+            }
+        } else {
+            loadingError.show();
+        }
+    }
+
+    this.errorCallback =  this.defaultErrorCallback;
 
     /**
      * Sets the response format for the request