From 549cdf348754c9d4a6de380a6f10890614f6aa72 Mon Sep 17 00:00:00 2001 From: kwaroran Date: Fri, 26 May 2023 05:30:13 +0900 Subject: [PATCH] [feat] change with enter --- src/lang/en.ts | 3 ++- src/lib/ChatScreens/DefaultChatScreen.svelte | 6 ++++-- src/lib/Setting/Pages/AccessibilitySettings.svelte | 5 +++++ src/ts/database.ts | 4 ++++ 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/lang/en.ts b/src/lang/en.ts index ab3b2f57..c944c896 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -278,5 +278,6 @@ export const languageEnglish = { charLoreBook: 'Character Lorebook', globalLoreBook: 'Global Lorebook', globalRegexScript: "Global Regex", - accessibility: "Accessibility" + accessibility: "Accessibility", + sendWithEnter: "Send with Enter Key" } \ No newline at end of file diff --git a/src/lib/ChatScreens/DefaultChatScreen.svelte b/src/lib/ChatScreens/DefaultChatScreen.svelte index 0801af79..16744bbb 100644 --- a/src/lib/ChatScreens/DefaultChatScreen.svelte +++ b/src/lib/ChatScreens/DefaultChatScreen.svelte @@ -205,8 +205,10 @@ bind:this={inputEle} on:keydown={(e) => { if(e.key.toLocaleLowerCase() === "enter" && (!e.shiftKey)){ - send() - e.preventDefault() + if($DataBase.sendWithEnter){ + send() + e.preventDefault() + } } if(e.key.toLocaleLowerCase() === "m" && (e.ctrlKey)){ reroll() diff --git a/src/lib/Setting/Pages/AccessibilitySettings.svelte b/src/lib/Setting/Pages/AccessibilitySettings.svelte index a45b17f8..7805a464 100644 --- a/src/lib/Setting/Pages/AccessibilitySettings.svelte +++ b/src/lib/Setting/Pages/AccessibilitySettings.svelte @@ -20,3 +20,8 @@ {language.instantRemove} + +
+ + {language.sendWithEnter} +
diff --git a/src/ts/database.ts b/src/ts/database.ts index 01d6e091..38ba7f10 100644 --- a/src/ts/database.ts +++ b/src/ts/database.ts @@ -251,6 +251,9 @@ export function setDatabase(data:Database){ if(checkNullish(data.globalscript)){ data.globalscript = [] } + if(checkNullish(data.sendWithEnter)){ + data.sendWithEnter = true + } changeLanguage(data.language) @@ -481,6 +484,7 @@ export interface Database{ model:string } globalscript: customscript[] + sendWithEnter:boolean }