supernets/hardlounge
supernets/hardlounge
4
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Disable clicking on the currently active channel

Browse Source 
channel.id does not change, which causes some wonky behaviour when the channel gets trimmed
This commit is contained in:
Pavel Djundik 2019-02-12 14:59:06 +02:00
parent a26fcb45b4
commit 3f3a22aa1e
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
client/js/lounge.js
View File

@ -103,11 +103,16 @@ window.vueMounted = () => {
// sidebar specifically. Needs to be done better when window management gets // sidebar specifically. Needs to be done better when window management gets
// refactored. // refactored.
const inSidebar = self.parents("#sidebar, #footer").length > 0; const inSidebar = self.parents("#sidebar, #footer").length > 0;
let channel; const channel = inSidebar ? findChannel(Number(self.attr("data-id"))) : null;
if (vueApp.activeChannel) { if (vueApp.activeChannel) {
const {channel: lastChannel} = vueApp.activeChannel; const {channel: lastChannel} = vueApp.activeChannel;
// If user clicks on the currently active channel, do nothing
if (channel && lastChannel === channel.channel) {
return;
}
if (lastChannel.messages.length > 0) { if (lastChannel.messages.length > 0) {
lastChannel.firstUnread = lastChannel.messages[lastChannel.messages.length - 1].id; lastChannel.firstUnread = lastChannel.messages[lastChannel.messages.length - 1].id;
} }
@ -119,8 +124,6 @@ window.vueMounted = () => {
} }
if (inSidebar) { if (inSidebar) {
channel = findChannel(Number(self.attr("data-id")));
vueApp.activeChannel = channel; vueApp.activeChannel = channel;
if (channel) { if (channel) {