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

Some fixes

Browse source
This commit is contained in:
Pavel Djundik 2018-07-10 12:20:52 +03:00 committed by Pavel Djundik
parent 121dd35c3b
commit 96569e71a3
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
client/components/Chat.vue
View file

@ -114,7 +114,7 @@ export default {
"channel.messages"() { "channel.messages"() {
const el = this.$refs.chat; const el = this.$refs.chat;
if (el.scrollHeight - el.scrollTop - el.offsetHeight > 30) { if (!el || el.scrollHeight - el.scrollTop - el.offsetHeight > 30) {
return; return;
} }

6
client/js/lounge.js
View file

@ -127,7 +127,11 @@ window.vueMounted = () => {
let channel; let channel;
if (vueApp.activeChannel) { if (vueApp.activeChannel) {
vueApp.activeChannel.channel.firstUnread = vueApp.activeChannel.channel.messages[vueApp.activeChannel.channel.messages.length - 1].id; const {channel: lastChannel} = vueApp.activeChannel;
if (lastChannel.messages.length > 0) {
lastChannel.firstUnread = lastChannel.messages[lastChannel.messages.length - 1].id;
}
} }
if (inSidebar) { if (inSidebar) {