deblan-mirror/thelounge
deblan-mirror/thelounge
1
0
Fork 0
mirror of https://github.com/thelounge/thelounge.git synced 2024-05-12 03:06:50 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1794 from thelounge/xpaw/handle-js-errors

Browse source 
Handle javascript errors while loading
This commit is contained in:
Jérémie Astori 2017-12-05 18:33:11 -05:00 committed by GitHub
parent ee6ff6a5e5 2afd4d7ec4
commit db53f13865
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 32 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
client/index.html
View file

@ -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>

26
client/js/loading-slow-alert.js
View file

@ -19,3 +19,29 @@ 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 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;
var details = document.createElement("details");
details.appendChild(summary);
details.appendChild(data);
title.parentNode.insertBefore(details, title.nextSibling);
};
window.addEventListener("error", window.g_LoungeErrorHandler);

5
client/js/socket-events/init.js
View file

@ -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);