rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-03-09 00:17:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

improved Escape hotkey logic

Browse Source
This commit is contained in:
RossAscends 2023-08-14 05:33:46 +09:00
parent 23a4705d36
commit 2935d98788
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
public/scripts/RossAscends-mods.js
View File

@ -1090,7 +1090,11 @@ $("document").ready(function () {
} }
if (event.key == "Escape") { //closes various panels if (event.key == "Escape") { //closes various panels
if ($("#curEditTextarea").is(":visible")) { //dont override Escape hotkey functions from script.js
//"close edit box" and "cancel stream generation".
if ($("#curEditTextarea").is(":visible") || $("#mes_stop").is(":visible")) {
console.debug('escape key, but deferring to script.js routines')
return return
} }
@ -1103,10 +1107,12 @@ $("document").ready(function () {
return return
} }
} }
if ($("#select_chat_popup").is(":visible")) { if ($("#select_chat_popup").is(":visible")) {
$("#select_chat_cross").trigger('click'); $("#select_chat_cross").trigger('click');
return return
} }
if ($("#character_popup").is(":visible")) { if ($("#character_popup").is(":visible")) {
$("#character_cross").trigger('click'); $("#character_cross").trigger('click');
return return
@ -1116,28 +1122,37 @@ $("document").ready(function () {
.not('#WorldInfo') .not('#WorldInfo')
.not('#left-nav-panel') .not('#left-nav-panel')
.not('#right-nav-panel') .not('#right-nav-panel')
.not('#floatingPrompt')
.is(":visible")) { .is(":visible")) {
let visibleDrawerContent = $(".drawer-content:visible") let visibleDrawerContent = $(".drawer-content:visible")
.not('#WorldInfo') .not('#WorldInfo')
.not('#left-nav-panel') .not('#left-nav-panel')
.not('#right-nav-panel') .not('#right-nav-panel')
.not('#floatingPrompt')
console.log(visibleDrawerContent)
$(visibleDrawerContent).parent().find('.drawer-icon').trigger('click'); $(visibleDrawerContent).parent().find('.drawer-icon').trigger('click');
return return
} }
if ($("#floatingPrompt").is(":visible")) { if ($("#floatingPrompt").is(":visible")) {
console.log('saw AN visible, trying to close')
$("#ANClose").trigger('click'); $("#ANClose").trigger('click');
return return
} }
if ($("#WorldInfo").is(":visible")) { if ($("#WorldInfo").is(":visible")) {
$("#WIDrawerIcon").trigger('click'); $("#WIDrawerIcon").trigger('click');
return return
} }
if ($("#left-nav-panel").is(":visible")) {
if ($("#left-nav-panel").is(":visible") &&
$(LPanelPin).prop('checked') === false) {
$("#leftNavDrawerIcon").trigger('click'); $("#leftNavDrawerIcon").trigger('click');
return return
} }
if ($("#right-nav-panel").is(":visible")) {
if ($("#right-nav-panel").is(":visible") &&
$(RPanelPin).prop('checked') === false) {
$("#rightNavDrawerIcon").trigger('click'); $("#rightNavDrawerIcon").trigger('click');
return return
} }