mirror of
https://github.com/thelounge/thelounge
synced 2024-11-26 05:50:22 +00:00
Handle javascript errors while loading
This commit is contained in:
parent
2f47307437
commit
e3823803aa
3 changed files with 21 additions and 1 deletions
|
@ -48,7 +48,7 @@
|
|||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-xs-12">
|
||||
<h1 class="title">The Lounge is loading…</h1>
|
||||
<h1 class="title" id="loading-title">The Lounge is loading…</h1>
|
||||
</div>
|
||||
<div class="col-xs-12">
|
||||
<p id="loading-page-message">Loading the app… <a href="http://enable-javascript.com/" target="_blank" rel="noopener">Make sure to have JavaScript enabled.</a></p>
|
||||
|
|
|
@ -19,3 +19,18 @@ setTimeout(function() {
|
|||
document.getElementById("loading-slow-reload").addEventListener("click", function() {
|
||||
location.reload();
|
||||
});
|
||||
|
||||
window.g_LoungeErrorHandler = function LoungeErrorHandler(error) {
|
||||
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 element = document.createElement("p");
|
||||
element.contentEditable = true;
|
||||
element.textContent = error instanceof ErrorEvent ? error.message : error;
|
||||
title.parentNode.insertBefore(element, title.nextSibling);
|
||||
};
|
||||
|
||||
window.addEventListener("error", window.g_LoungeErrorHandler);
|
||||
|
|
|
@ -44,6 +44,11 @@ socket.on("init", function(data) {
|
|||
$("body").removeClass("signed-out");
|
||||
$("#loading").remove();
|
||||
$("#sign-in").remove();
|
||||
|
||||
if (window.g_LoungeErrorHandler) {
|
||||
window.removeEventListener("error", window.g_LoungeErrorHandler);
|
||||
window.g_LoungeErrorHandler = null;
|
||||
}
|
||||
}
|
||||
|
||||
openCorrectChannel(previousActive, data.active);
|
||||
|
|
Loading…
Reference in a new issue