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

No swiping hotkeys when modifiers are held.

Browse Source
This commit is contained in:
Gness Erquint
2025-03-15 00:43:37 +03:00
parent bafb2cba95
commit e57396040d
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1018,6 +1018,14 @@ export function initRossMods() {
return false; return false;
} }
function isModifiedKeyboardEvent(event) {
return (event instanceof KeyboardEvent &&
event.shiftKey ||
event.ctrlKey ||
event.altKey ||
event.metaKey);
}
$(document).on('keydown', async function (event) { $(document).on('keydown', async function (event) {
await processHotkeys(event.originalEvent); await processHotkeys(event.originalEvent);
}); });
@@ -1141,7 +1149,8 @@ export function initRossMods() {
$('#send_textarea').val() === '' && $('#send_textarea').val() === '' &&
$('#character_popup').css('display') === 'none' && $('#character_popup').css('display') === 'none' &&
$('#shadow_select_chat_popup').css('display') === 'none' && $('#shadow_select_chat_popup').css('display') === 'none' &&
!isInputElementInFocus() !isInputElementInFocus() &&
!isModifiedKeyboardEvent(event)
) { ) {
$('.swipe_left:last').trigger('click', { source: 'keyboard', repeated: event.repeat }); $('.swipe_left:last').trigger('click', { source: 'keyboard', repeated: event.repeat });
return; return;
@@ -1154,7 +1163,8 @@ export function initRossMods() {
$('#send_textarea').val() === '' && $('#send_textarea').val() === '' &&
$('#character_popup').css('display') === 'none' && $('#character_popup').css('display') === 'none' &&
$('#shadow_select_chat_popup').css('display') === 'none' && $('#shadow_select_chat_popup').css('display') === 'none' &&
!isInputElementInFocus() !isInputElementInFocus() &&
!isModifiedKeyboardEvent(event)
) { ) {
$('.swipe_right:last').trigger('click', { source: 'keyboard', repeated: event.repeat }); $('.swipe_right:last').trigger('click', { source: 'keyboard', repeated: event.repeat });
return; return;

2
public/scripts/templates/hotkeys.html
View File

@@ -5,7 +5,7 @@
<li><kbd data-i18n="help_hotkeys_1">Up</kbd> = <span data-i18n="help_hotkeys_2">Edit last message in chat</span></li> <li><kbd data-i18n="help_hotkeys_1">Up</kbd> = <span data-i18n="help_hotkeys_2">Edit last message in chat</span></li>
<li><kbd data-i18n="help_hotkeys_3">Ctrl+Up</kbd> = <span data-i18n="help_hotkeys_4">Edit last USER message in chat</span></li> <li><kbd data-i18n="help_hotkeys_3">Ctrl+Up</kbd> = <span data-i18n="help_hotkeys_4">Edit last USER message in chat</span></li>
<li><kbd data-i18n="help_hotkeys_5">Left</kbd> = <span data-i18n="help_hotkeys_6">swipe left</span></li> <li><kbd data-i18n="help_hotkeys_5">Left</kbd> = <span data-i18n="help_hotkeys_6">swipe left</span></li>
<li><kbd data-i18n="help_hotkeys_7">Right</kbd> = <span data-i18n="help_hotkeys_8">swipe right (NOTE: swipe hotkeys are disabled when chatbar has something typed into it)</span></li> <li><kbd data-i18n="help_hotkeys_7">Right</kbd> = <span data-i18n="help_hotkeys_8">swipe right (NOTE: swipe hotkeys only apply without modifiers and are disabled when chatbar has something typed into it)</span></li>
<li><kbd data-i18n="help_hotkeys_9">Enter</kbd> <span data-i18n="help_hotkeys_10">(with chat bar selected)</span> = <span data-i18n="help_hotkeys_10_1">send your message to AI</span></li> <li><kbd data-i18n="help_hotkeys_9">Enter</kbd> <span data-i18n="help_hotkeys_10">(with chat bar selected)</span> = <span data-i18n="help_hotkeys_10_1">send your message to AI</span></li>
<li><kbd data-i18n="help_hotkeys_11">Ctrl+Enter</kbd> = <span data-i18n="help_hotkeys_12">Regenerate the last AI response</span></li> <li><kbd data-i18n="help_hotkeys_11">Ctrl+Enter</kbd> = <span data-i18n="help_hotkeys_12">Regenerate the last AI response</span></li>
<li><kbd data-i18n="help_hotkeys_13">Alt+Enter</kbd> = <span data-i18n="help_hotkeys_14">Continue the last AI response</span></li> <li><kbd data-i18n="help_hotkeys_13">Alt+Enter</kbd> = <span data-i18n="help_hotkeys_14">Continue the last AI response</span></li>