Merge pull request #3688 from Erquint/staging No swiping hotkeys when modifiers are held.

dc4612a0e2338b3bbf13e562037ccb2f1c9faf45

Cohee <18619528+Cohee1207@users.noreply.github.com>

Signed

public/scripts/RossAscends-mods.js+12 -2 Viewed

         return false;
+    }
 +    function isModifiedKeyboardEvent(event) {
 +        return (event instanceof KeyboardEvent &&
 +            event.shiftKey ||
 +            event.ctrlKey ||
 +            event.altKey ||
 +            event.metaKey);
 +    }
++
     $(document).on('keydown', async function (event) {
         await processHotkeys(event.originalEvent);
     });

                 $('#send_textarea').val() === '' &&
                 $('#character_popup').css('display') === 'none' &&
                 $('#shadow_select_chat_popup').css('display') === 'none' &&
                 !isInputElementInFocus() &&
 +                !isModifiedKeyboardEvent(event)
             ) {
                 $('.swipe_left:last').trigger('click', { source: 'keyboard', repeated: event.repeat });
                 return;

                 $('#send_textarea').val() === '' &&
                 $('#character_popup').css('display') === 'none' &&
                 $('#shadow_select_chat_popup').css('display') === 'none' &&
                 !isInputElementInFocus() &&
 +                !isModifiedKeyboardEvent(event)
             ) {
                 $('.swipe_right:last').trigger('click', { source: 'keyboard', repeated: event.repeat });
                 return;

public/scripts/templates/hotkeys.html+1 -1 Viewed

     <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_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 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_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>