Mirrors/thelounge
2
0
Fork 0
mirror of https://github.com/thelounge/thelounge synced 2024-11-22 20:13:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove showInActive if active network differs

Browse source
This commit is contained in:
Pavel Djundik 2020-01-05 18:30:56 +02:00
parent 5c64eaf41e
commit e73575a342
1 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
client/js/socket-events/msg.js
View file

@ -29,25 +29,29 @@ socket.on("msg", function(data) {
// Display received notices and errors in currently active channel. // Display received notices and errors in currently active channel.
// Reloading the page will put them back into the lobby window. // Reloading the page will put them back into the lobby window.
// We only want to put errors/notices in active channel if they arrive on the same network if (data.msg.showInActive) {
if ( // We only want to put errors/notices in active channel if they arrive on the same network
data.msg.showInActive && if (
store.state.activeChannel && store.state.activeChannel &&
store.state.activeChannel.network === receivingChannel.network store.state.activeChannel.network === receivingChannel.network
) { ) {
channel = store.state.activeChannel.channel; channel = store.state.activeChannel.channel;
if (data.chan === channel.id) { if (data.chan === channel.id) {
// If active channel is the intended channel for this message, // If active channel is the intended channel for this message,
// remove the showInActive flag // remove the showInActive flag
data.msg.showInActive = false; delete data.msg.showInActive;
} else {
data.chan = channel.id;
}
} else { } else {
data.chan = channel.id; delete data.msg.showInActive;
} }
} else if (!isActiveChannel) { }
// Do not set unread counter for channel if it is currently active on this client
// It may increase on the server before it processes channel open event from this client
// Do not set unread counter for channel if it is currently active on this client
// It may increase on the server before it processes channel open event from this client
if (!isActiveChannel) {
if (typeof data.highlight !== "undefined") { if (typeof data.highlight !== "undefined") {
channel.highlight = data.highlight; channel.highlight = data.highlight;
} }