rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix options menu hide/show & iOS blur

Browse Source
This commit is contained in:
RossAscends
2023-06-10 23:21:23 +09:00
parent 5113c04281
commit c4e2480212
4 changed files with 83 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
public/script.js
View File

@ -6216,42 +6216,45 @@ $(document).ready(function () {
}
});
let hideOptionsTimeout;
let isAnimating = false;
const optionsDiv = $("#options");
const optionsButtonDiv = $("#options_button");
function showOptions() {
function toggleOptions() {
showBookmarksButtons();
if ((isAnimating) ||
(optionsDiv.is(":visible") && optionsDiv.is(":hover"))) {
return;
}
isAnimating = true;
optionsPopper.update();
const optionsDiv = $("#options");
const optionsButtonDiv = $("#options_button");
const hideOptions = () => {
if (!optionsDiv.is(':hover') && !optionsButtonDiv.is(':hover')) {
optionsDiv.hide(200);
}
};
optionsDiv.on('mouseenter touchstart', () => clearTimeout(hideOptionsTimeout));
optionsButtonDiv.on('mouseenter touchstart', () => {
clearTimeout(hideOptionsTimeout);
hideOptionsTimeout = setTimeout(() => {
optionsDiv.show(200);
}, 200);
});
optionsDiv.on('mouseleave', () => hideOptionsTimeout = setTimeout(hideOptions, 500));
optionsButtonDiv.on('mouseleave', () => hideOptionsTimeout = setTimeout(hideOptions, 500));
//optionsDiv.show(200);
optionsDiv.toggle(200, () => isAnimating = false);
}
$("#options_button").on('mouseenter click touchstart', showOptions);
//show/hide options on hoverstate/click
optionsButtonDiv.on('mouseenter click', () => {
if (optionsDiv.is(':visible')) return;
setTimeout(() => toggleOptions(), 200);
});
optionsButtonDiv.on('mouseleave', () => {
if (optionsDiv.is(':hidden')) return;
setTimeout(() => toggleOptions(), 200);
});
optionsDiv.on('mouseleave', () => {
setTimeout(() => toggleOptions(), 200);
})
//close options menu if open and user clicked outside it and button
$(document).on('click touchend', (e) => {
const target = e.target;
const optionsDiv = $("#options");
const optionsButtonDiv = $("#options_button");
if (!$(target).closest(optionsDiv).length && !$(target).closest(optionsButtonDiv).length &&
target !== optionsDiv[0] && target !== optionsButtonDiv[0] &&
if (![optionsDiv[0], optionsButtonDiv[0]].includes(target) &&
!optionsDiv.is(':hover') &&
!optionsButtonDiv.is(':hover')) {
optionsDiv.hide(200);
!optionsButtonDiv.is(':hover') &&
!isAnimating &&
optionsDiv.is(":visible")) {
setTimeout(() => toggleOptions(), 200);
}
});
@ -6542,7 +6545,7 @@ $(document).ready(function () {
if (this_chid !== undefined || selected_group) {
// Previously system messages we're allowed to be edited
/*const message = $(this).closest(".mes");
if (message.data("isSystem")) {
return;
}*/