rixty
/
SillyTavern
mirror of https://github.com/SillyTavern/SillyTavern.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'SillyTavern:staging' into staging

This commit is contained in:
Yokayo 2024-07-23 19:59:37 +07:00 committed by GitHub
parent 25bdc0cfc4 b3c2f37a0c
commit 5c61c47f31
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
public/script.js
View File

@ -9253,12 +9253,26 @@ jQuery(async function () {
} }
}); });
const chatElementScroll = document.getElementById('chat'); const chatElementScroll = document.getElementById('chat');
chatElementScroll.addEventListener('wheel', function () { const chatScrollHandler = function () {
if (power_user.waifuMode) {
scrollLock = true; scrollLock = true;
}, { passive: true }); return;
chatElementScroll.addEventListener('touchstart', function () { }
const scrollIsAtBottom = Math.abs(chatElementScroll.scrollHeight - chatElementScroll.clientHeight - chatElementScroll.scrollTop) < 1;
// Resume autoscroll if the user scrolls to the bottom
if (scrollLock && scrollIsAtBottom) {
scrollLock = false;
}
// Cancel autoscroll if the user scrolls up
if (!scrollLock && !scrollIsAtBottom) {
scrollLock = true; scrollLock = true;
}, { passive: true }); }
};
chatElementScroll.addEventListener('wheel', chatScrollHandler, { passive: true });
chatElementScroll.addEventListener('touchmove', chatScrollHandler, { passive: true });
chatElementScroll.addEventListener('scroll', function () { chatElementScroll.addEventListener('scroll', function () {
if (is_use_scroll_holder) { if (is_use_scroll_holder) {
this.scrollTop = scroll_holder; this.scrollTop = scroll_holder;