From a5c41a9c90868d789ef957e674a329ddbd8a602d Mon Sep 17 00:00:00 2001 From: Xyphyn Date: Fri, 11 Aug 2023 13:59:24 -0700 Subject: [PATCH] feat: add and close #94 --- src/lib/components/lemmy/comment/CommentForm.svelte | 3 ++- src/lib/components/markdown/MarkdownEditor.svelte | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/lib/components/lemmy/comment/CommentForm.svelte b/src/lib/components/lemmy/comment/CommentForm.svelte index 6f60cf33..6d60f1c2 100644 --- a/src/lib/components/lemmy/comment/CommentForm.svelte +++ b/src/lib/components/lemmy/comment/CommentForm.svelte @@ -73,7 +73,8 @@ ? 'This post is locked.' : placeholders.get('comment')} bind:value - disabled={locked} + disabled={locked || loading} + on:confirm={submit} /> {/if} {#if actions || previewAction} diff --git a/src/lib/components/markdown/MarkdownEditor.svelte b/src/lib/components/markdown/MarkdownEditor.svelte index 4a634617..6524006f 100644 --- a/src/lib/components/markdown/MarkdownEditor.svelte +++ b/src/lib/components/markdown/MarkdownEditor.svelte @@ -8,6 +8,7 @@ import Modal from '$lib/components/ui/modal/Modal.svelte' import { toast } from '$lib/components/ui/toasts/toasts.js' import { uploadImage } from '$lib/lemmy.js' + import { createEventDispatcher } from 'svelte' import { CodeBracket, ExclamationTriangle, @@ -21,6 +22,9 @@ export let value: string = '' export let label: string | undefined = undefined export let previewButton: boolean = false + export let disabled: boolean = false + + const dispatcher = createEventDispatcher<{ confirm: string }>() let textArea: HTMLTextAreaElement @@ -89,6 +93,7 @@ KeyS: () => wrapSelection('~~', '~~'), KeyH: () => wrapSelection('\n# ', ''), KeyK: () => wrapSelection('[](', ')'), + Enter: () => dispatcher('confirm', value), } @@ -223,6 +228,7 @@ overflow-hidden focus-within:border-black focus-within:dark:border-white transit bind:value bind:item={textArea} on:keydown={(e) => { + if (disabled) return if (e.ctrlKey) { // @ts-ignore let shortcut = shortcuts[e.code]