deblan-mirror/thelounge
deblan-mirror/thelounge
1
0
Fork 0
mirror of https://github.com/thelounge/thelounge.git synced 2024-06-02 13:52:17 +02:00
Code Issues Projects Releases Wiki Activity

Move confirmExit

Browse source
This commit is contained in:
Pavel Djundik 2019-10-20 17:45:38 +03:00
parent b74cc4387a
commit f76ad57c63
3 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
client/components/App.vue
View file

@ -58,7 +58,6 @@ export default {
clearTimeout(this.dayChangeTimeout); clearTimeout(this.dayChangeTimeout);
}, },
methods: { methods: {
isPublic: () => document.body.classList.contains("public"),
msUntilNextDay() { msUntilNextDay() {
// Compute how many milliseconds are remaining until the next day starts // Compute how many milliseconds are remaining until the next day starts
const today = new Date(); const today = new Date();

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

@ -6,7 +6,6 @@ const socket = require("../socket");
const webpush = require("../webpush"); const webpush = require("../webpush");
const sidebar = $("#sidebar"); const sidebar = $("#sidebar");
const storage = require("../localStorage"); const storage = require("../localStorage");
const utils = require("../utils");
const constants = require("../constants"); const constants = require("../constants");
const {vueApp, initChannel} = require("../vue"); const {vueApp, initChannel} = require("../vue");
@ -54,9 +53,14 @@ socket.on("init", function(data) {
} }
vueApp.$nextTick(() => openCorrectChannel(previousActive, data.active)); vueApp.$nextTick(() => openCorrectChannel(previousActive, data.active));
utils.confirmExit();
vueApp.synchronizeNotifiedState(); vueApp.synchronizeNotifiedState();
if (document.body.classList.contains("public")) {
window.addEventListener(
"beforeunload",
() => "Are you sure you want to navigate away from this page?"
);
}
}); });
function openCorrectChannel(clientActive, serverActive) { function openCorrectChannel(clientActive, serverActive) {

9
client/js/utils.js
View file

@ -9,7 +9,6 @@ var serverHash = -1; // eslint-disable-line no-var
module.exports = { module.exports = {
findCurrentNetworkChan, findCurrentNetworkChan,
serverHash, serverHash,
confirmExit,
scrollIntoViewNicely, scrollIntoViewNicely,
hasRoleInChannel, hasRoleInChannel,
move, move,
@ -42,14 +41,6 @@ function scrollIntoViewNicely(el) {
el.scrollIntoView({block: "center", inline: "nearest"}); el.scrollIntoView({block: "center", inline: "nearest"});
} }
function confirmExit() {
if ($(document.body).hasClass("public")) {
window.onbeforeunload = function() {
return "Are you sure you want to navigate away from this page?";
};
}
}
function move(array, old_index, new_index) { function move(array, old_index, new_index) {
if (new_index >= array.length) { if (new_index >= array.length) {
let k = new_index - array.length; let k = new_index - array.length;