From c2c5aa01a417c07a09efc01b2606677f19059275 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Thu, 24 Mar 2022 23:39:20 +0200 Subject: [PATCH] f --- files/assets/js/chat.js | 6 ++---- files/templates/chat.html | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/files/assets/js/chat.js b/files/assets/js/chat.js index a788e447b..62a63f318 100644 --- a/files/assets/js/chat.js +++ b/files/assets/js/chat.js @@ -11,7 +11,6 @@ const site_name = document.getElementById('site_name').value const slurreplacer = document.getElementById('slurreplacer').value let notifs = 0; -let scrolled_down = true; let focused = true; let is_typing = false; let alert=true; @@ -55,8 +54,7 @@ socket.on('speak', function(json) { let users = document.getElementsByClassName('userlink'); let last_user = users[users.length-1].innerHTML; - console.log(last_user) - console.log(json['username']) + let scrolled_down = (box.scrollHeight - box.scrollTop <= window.innerHeight-109) if (last_user == json['username']) { document.getElementsByClassName('chat-line')[0].classList.remove('diff') @@ -79,7 +77,7 @@ socket.on('speak', function(json) { let line = document.getElementsByClassName('chat-line')[0].cloneNode(true) bs_trigger(line) box.append(line) - box.scrollTo(0, box.scrollHeight) + if (scrolled_down) box.scrollTo(0, box.scrollHeight) }) diff --git a/files/templates/chat.html b/files/templates/chat.html index c8b8a9bd5..f014cf409 100644 --- a/files/templates/chat.html +++ b/files/templates/chat.html @@ -165,7 +165,7 @@ - +