diff --git a/frontend/src/scripts/elements/commandline-lists.ts b/frontend/src/scripts/elements/commandline-lists.ts index 92aec0908..f1ba448cd 100644 --- a/frontend/src/scripts/elements/commandline-lists.ts +++ b/frontend/src/scripts/elements/commandline-lists.ts @@ -200,6 +200,7 @@ Misc.getFontsList().then((fonts) => { UpdateConfig.previewFontFamily(Config.fontFamily); }, exec: (name) => { + if (!name) return; UpdateConfig.setFontFamily(name.replace(/\s/g, "_")); // Settings.groups.fontFamily.updateInput(); }, @@ -1419,6 +1420,7 @@ const commandsPaceCaret: MonkeyTypes.CommandsGroup = { configValue: "custom", input: true, exec: (input): void => { + if (!input) return; UpdateConfig.setPaceCaretCustomSpeed(parseInt(input)); UpdateConfig.setPaceCaret("custom"); TestLogic.restart(); @@ -1445,6 +1447,7 @@ const commandsMinWpm: MonkeyTypes.CommandsGroup = { configValue: "custom", input: true, exec: (input): void => { + if (!input) return; UpdateConfig.setMinWpmCustomSpeed(parseInt(input)); UpdateConfig.setMinWpm("custom"); }, @@ -1470,6 +1473,7 @@ const commandsMinAcc: MonkeyTypes.CommandsGroup = { configValue: "custom", input: true, exec: (input): void => { + if (!input) return; UpdateConfig.setMinAccCustom(parseInt(input)); UpdateConfig.setMinAcc("custom"); }, @@ -1495,6 +1499,7 @@ const commandsMinBurst: MonkeyTypes.CommandsGroup = { configValue: "fixed", input: true, exec: (input): void => { + if (!input) return; UpdateConfig.setMinBurst("fixed"); UpdateConfig.setMinBurstCustomSpeed(parseInt(input)); }, @@ -1505,6 +1510,7 @@ const commandsMinBurst: MonkeyTypes.CommandsGroup = { configValue: "flex", input: true, exec: (input): void => { + if (!input) return; UpdateConfig.setMinBurst("flex"); UpdateConfig.setMinBurstCustomSpeed(parseInt(input)); }, @@ -1860,6 +1866,7 @@ const commandsWordCount: MonkeyTypes.CommandsGroup = { display: "custom...", input: true, exec: (input): void => { + if (!input) return; UpdateConfig.setMode("words"); UpdateConfig.setWordCount(parseInt(input)); TestLogic.restart(); @@ -2127,6 +2134,7 @@ const commandsTimeConfig: MonkeyTypes.CommandsGroup = { display: "custom...", input: true, exec: (input): void => { + if (!input) return; UpdateConfig.setMode("time"); UpdateConfig.setTimeConfig(parseInt(input)); TestLogic.restart(); @@ -2866,6 +2874,7 @@ export const defaultCommands: MonkeyTypes.CommandsGroup = { defaultValue: "", input: true, exec: (input): void => { + if (!input) return; UpdateConfig.setCustomBackground(input); }, }, @@ -2929,7 +2938,10 @@ export const defaultCommands: MonkeyTypes.CommandsGroup = { input: true, icon: "fa-tint", exec: (input): void => { - UpdateConfig.setCustomLayoutfluid(input); + if (!input) return; + UpdateConfig.setCustomLayoutfluid( + input as MonkeyTypes.CustomLayoutFluidSpaces + ); if (Config.funbox === "layoutfluid") TestLogic.restart(); // UpdateConfig.setLayout( // Config.customLayoutfluid @@ -3136,6 +3148,7 @@ export const defaultCommands: MonkeyTypes.CommandsGroup = { icon: "fa-cog", input: true, exec: (input): void => { + if (!input) return; try { UpdateConfig.apply(JSON.parse(input)); UpdateConfig.saveToLocalStorage(); diff --git a/frontend/src/scripts/elements/commandline.ts b/frontend/src/scripts/elements/commandline.ts index dcca80fd5..78fb8e98e 100644 --- a/frontend/src/scripts/elements/commandline.ts +++ b/frontend/src/scripts/elements/commandline.ts @@ -405,7 +405,7 @@ $("#commandInput input").keydown((e) => { //enter e.preventDefault(); const command = $("#commandInput input").attr("command"); - const value = $("#commandInput input").val(); + const value = $("#commandInput input").val() as string; const list = CommandlineLists.current[CommandlineLists.current.length - 1]; $.each(list.list, (_index, obj) => { if (obj.id == command) { diff --git a/frontend/src/scripts/types/types.d.ts b/frontend/src/scripts/types/types.d.ts index 8e876b032..c8d062041 100644 --- a/frontend/src/scripts/types/types.d.ts +++ b/frontend/src/scripts/types/types.d.ts @@ -496,9 +496,6 @@ declare namespace MonkeyTypes { }; } - // eslint-disable-next-line no-unused-vars - type ExecFunction = (input?: any) => any; - interface Command { id: string; display: string; @@ -513,8 +510,8 @@ declare namespace MonkeyTypes { defaultValue?: string; configValue?: string | number | boolean | number[]; configValueMode?: string; - exec?: ExecFunction; - hover?: ExecFunction; + exec?: (input?: string) => void; + hover?: () => void; available?: () => void; beforeSubgroup?: () => void; }