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

Merge branch 'dev' of https://github.com/SillyLossy/TavernAI into dev

Browse Source
This commit is contained in:
Cohee
2023-06-07 23:08:22 +03:00
parent 1d28e030ce c4bfaa325e
commit 0a192707a6
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
public/script.js
View File

@@ -4890,7 +4890,7 @@ function openAlternateGreetings() {
function addAlternateGreeting(template, greeting, index, getArray) { function addAlternateGreeting(template, greeting, index, getArray) {
const greetingBlock = $('#alternate_greeting_form_template .alternate_greeting').clone(); const greetingBlock = $('#alternate_greeting_form_template .alternate_greeting').clone();
greetingBlock.find('.alternate_greeting_text').on('input', async function() { greetingBlock.find('.alternate_greeting_text').on('input', async function () {
const value = $(this).val(); const value = $(this).val();
const array = getArray(); const array = getArray();
array[index] = value; array[index] = value;
@@ -6190,10 +6190,15 @@ $(document).ready(function () {
}; };
optionsDiv.on('mouseenter touchstart', () => clearTimeout(hideOptionsTimeout)); optionsDiv.on('mouseenter touchstart', () => clearTimeout(hideOptionsTimeout));
optionsButtonDiv.on('mouseenter touchstart', () => clearTimeout(hideOptionsTimeout)); optionsButtonDiv.on('mouseenter touchstart', () => {
clearTimeout(hideOptionsTimeout);
hideOptionsTimeout = setTimeout(() => {
optionsDiv.show(200);
}, 200);
});
optionsDiv.on('mouseleave', () => hideOptionsTimeout = setTimeout(hideOptions, 500)); optionsDiv.on('mouseleave', () => hideOptionsTimeout = setTimeout(hideOptions, 500));
optionsButtonDiv.on('mouseleave', () => hideOptionsTimeout = setTimeout(hideOptions, 500)); optionsButtonDiv.on('mouseleave', () => hideOptionsTimeout = setTimeout(hideOptions, 500));
optionsDiv.show(200); //optionsDiv.show(200);
} }
$("#options_button").on('mouseenter click touchstart', showOptions); $("#options_button").on('mouseenter click touchstart', showOptions);