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

A little cleanup

Browse source
This commit is contained in:
Pavel Djundik 2018-07-19 20:19:45 +03:00 committed by Pavel Djundik
parent 104692007f
commit cebfa6ac84
3 changed files with 28 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
client/js/options.js
View file

@ -3,7 +3,6 @@
const $ = require("jquery");
const escapeRegExp = require("lodash/escapeRegExp");
const storage = require("./localStorage");
const tz = require("./libs/handlebars/tz");
const socket = require("./socket");
const {vueApp} = require("./vue");
require("../js/autocompletion");

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

@ -18,35 +18,39 @@ socket.on("init", function(data) {
const networks = new Set(JSON.parse(storage.get("thelounge.networks.collapsed")));
for (const network of data.networks) {
network.isCollapsed = networks.has(network.uuid);
network.channels.forEach(initChannel);
const currentNetwork = vueApp.networks.find((n) => n.uuid === network.uuid);
// TODO: Make this updating more efficient
if (currentNetwork) {
network.isJoinChannelShown = currentNetwork.isJoinChannelShown;
network.isCollapsed = currentNetwork.isCollapsed;
for (const channel of network.channels) {
const currentChannel = currentNetwork.channels.find((c) => c.id === channel.id);
if (currentChannel) {
channel.scrolledToBottom = currentChannel.scrolledToBottom;
channel.pendingMessage = currentChannel.pendingMessage;
if (currentChannel.messages) {
channel.messages = currentChannel.messages.concat(channel.messages);
}
if (currentChannel.moreHistoryAvailable) {
channel.moreHistoryAvailable = true;
}
}
}
} else {
// If we are reconnecting, merge existing state variables because they don't exist on the server
if (!currentNetwork) {
network.isJoinChannelShown = false;
network.isCollapsed = networks.has(network.uuid);
continue;
}
network.channels.forEach(initChannel);
network.isJoinChannelShown = currentNetwork.isJoinChannelShown;
for (const channel of network.channels) {
const currentChannel = currentNetwork.channels.find((c) => c.id === channel.id);
if (!currentChannel) {
continue;
}
channel.scrolledToBottom = currentChannel.scrolledToBottom;
channel.pendingMessage = currentChannel.pendingMessage;
// Reconnection only sends new messages, so merge it on the client
if (currentChannel.messages) {
channel.messages = currentChannel.messages.concat(channel.messages);
}
if (currentChannel.moreHistoryAvailable) {
channel.moreHistoryAvailable = true;
}
}
}
vueApp.networks = data.networks;

4
client/js/socket-events/network.js
View file

@ -14,10 +14,6 @@ socket.on("network", function(data) {
network.isCollapsed = false;
network.channels.forEach(initChannel);
for (const channel of network.channels) {
initChannel(channel);
}
vueApp.networks.push(network);
vueApp.$nextTick(() => {