From 69477ff5d0b566c3aabe85c362dad6293eca4229 Mon Sep 17 00:00:00 2001 From: Miodec Date: Thu, 9 Apr 2026 20:55:48 +0200 Subject: [PATCH 1/3] ayayayaaaa --- frontend/src/ts/states/hotkeys.ts | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/frontend/src/ts/states/hotkeys.ts b/frontend/src/ts/states/hotkeys.ts index b5356a73374e..896c4301038b 100644 --- a/frontend/src/ts/states/hotkeys.ts +++ b/frontend/src/ts/states/hotkeys.ts @@ -28,14 +28,25 @@ createEffect(() => { function updateHotkeys(): Hotkeys { const isOnTestPage = getActivePage() === "test"; + + const quickRestartIsTab = getConfig.quickRestart === "tab"; + const quickRestartIsEnter = getConfig.quickRestart === "enter"; + // const quickRestartIsEsc = getConfig.quickRestart === "esc"; + + const commandlineIsTab = getConfig.quickRestart === "esc"; + // const commandlineIsEsc = getConfig.quickRestart !== "esc"; + return { quickRestart: shiftHotkey( quickRestartHotkeyMap[getConfig.quickRestart], - isOnTestPage && (wordsHaveTab() || isLongTest()), + isOnTestPage && + ((wordsHaveTab() && quickRestartIsTab) || + (wordsHaveNewline() && quickRestartIsEnter) || + isLongTest()), ), commandline: shiftHotkey( - getConfig.quickRestart === "esc" ? "Tab" : "Escape", - isOnTestPage && wordsHaveNewline(), + commandlineIsTab ? "Tab" : "Escape", + isOnTestPage && wordsHaveTab() && commandlineIsTab, ), }; } From 05a53b68caa656dbf5381acd0d96d2394da32b0d Mon Sep 17 00:00:00 2001 From: Miodec Date: Thu, 9 Apr 2026 21:10:46 +0200 Subject: [PATCH 2/3] yayooo --- frontend/src/ts/input/hotkeys/quickrestart.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/frontend/src/ts/input/hotkeys/quickrestart.ts b/frontend/src/ts/input/hotkeys/quickrestart.ts index 4cd26a4c7b68..1b25dbc22179 100644 --- a/frontend/src/ts/input/hotkeys/quickrestart.ts +++ b/frontend/src/ts/input/hotkeys/quickrestart.ts @@ -6,7 +6,7 @@ import { getActivePage } from "../../states/core"; import { hotkeys, quickRestartHotkeyMap } from "../../states/hotkeys"; import { createHotkey } from "./utils"; import { getConfig } from "../../config/store"; -import { isLongTest } from "../../states/test"; +import { isLongTest, wordsHaveNewline, wordsHaveTab } from "../../states/test"; function quickRestart(e: KeyboardEvent): void { if (isAnyPopupVisible()) { @@ -37,5 +37,10 @@ createHotkey( createHotkey( () => quickRestartHotkeyMap[getConfig.quickRestart], quickRestart, - () => ({ enabled: isLongTest() }), + () => ({ + enabled: + isLongTest() && + !(wordsHaveTab() && getConfig.quickRestart === "tab") && + !(wordsHaveNewline() && getConfig.quickRestart === "enter"), + }), ); From c7791cb2d0905c9c1b62ba0bc18ccd0df6d14a44 Mon Sep 17 00:00:00 2001 From: Miodec Date: Thu, 9 Apr 2026 21:13:11 +0200 Subject: [PATCH 3/3] funbox --- frontend/src/ts/states/hotkeys.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/src/ts/states/hotkeys.ts b/frontend/src/ts/states/hotkeys.ts index 896c4301038b..61ac0103f535 100644 --- a/frontend/src/ts/states/hotkeys.ts +++ b/frontend/src/ts/states/hotkeys.ts @@ -41,7 +41,8 @@ function updateHotkeys(): Hotkeys { quickRestartHotkeyMap[getConfig.quickRestart], isOnTestPage && ((wordsHaveTab() && quickRestartIsTab) || - (wordsHaveNewline() && quickRestartIsEnter) || + ((wordsHaveNewline() || getConfig.funbox.includes("58008")) && + quickRestartIsEnter) || isLongTest()), ), commandline: shiftHotkey(