This is taking longer than it should, there might be connectivity issues.
-
-
+
+ This is taking longer than it should, there might be
+ connectivity issues.
+
+
diff --git a/client/js/loading-slow-alert.js b/client/js/loading-slow-alert.js
index 2eb990dd..8ece9ead 100644
--- a/client/js/loading-slow-alert.js
+++ b/client/js/loading-slow-alert.js
@@ -8,40 +8,54 @@
* so that the timeout can be triggered while slow JS is loading
*/
-setTimeout(function() {
- var element = document.getElementById("loading-slow");
+function displayReload() {
+ var loadingReload = document.getElementById("loading-reload");
+ if (loadingReload) {
+ loadingReload.style.display = "block";
+ }
+}
- if (element) {
- element.style.display = "block";
+var loadingSlowTimeout = setTimeout(function() {
+ var loadingSlow = document.getElementById("loading-slow");
+
+ // The parent element, #loading, is being removed when the app is loaded.
+ // Since the timer is not cancelled, `loadingSlow` can be not found after
+ // 5s. Wrap everything in this block to make sure nothing happens if the
+ // element does not exist (i.e. page has loaded).
+ if (loadingSlow) {
+ loadingSlow.style.display = "block";
+ displayReload();
}
}, 5000);
-document.getElementById("loading-slow-reload").addEventListener("click", function() {
+document.getElementById("loading-reload").addEventListener("click", function() {
location.reload();
});
-window.g_LoungeErrorHandler = function LoungeErrorHandler(error) {
+window.g_LoungeErrorHandler = function LoungeErrorHandler(e) {
var title = document.getElementById("loading-title");
title.textContent = "An error has occured";
- title = document.getElementById("loading-page-message");
- title.textContent = "An error has occured that prevented the client from loading correctly.";
+ var message = document.getElementById("loading-page-message");
+ message.textContent = "An error has occured that prevented the client from loading correctly.";
var summary = document.createElement("summary");
summary.textContent = "More details";
- if (error instanceof ErrorEvent) {
- error = error.message + "\n\n" + error.stack + "\n\nView developer tools console for more information and a better stacktrace.";
- }
-
var data = document.createElement("pre");
- data.contentEditable = true;
- data.textContent = error;
+ data.textContent = e.message; // e is an ErrorEvent
+
+ var info = document.createElement("p");
+ info.textContent = "Open the developer tools of your browser for more information.";
var details = document.createElement("details");
details.appendChild(summary);
details.appendChild(data);
- title.parentNode.insertBefore(details, title.nextSibling);
+ details.appendChild(info);
+ message.parentNode.insertBefore(details, message.nextSibling);
+
+ window.clearTimeout(loadingSlowTimeout);
+ displayReload();
};
window.addEventListener("error", window.g_LoungeErrorHandler);