From ecbe595b343416ddecbc8363baab6ac3e299f70b Mon Sep 17 00:00:00 2001
From: Leah <kevinlukej@gmail.com>
Date: Mon, 26 Aug 2024 19:09:30 +0200
Subject: [PATCH 1/2] added event to detect when control and enter are pressed
 to confirm it. Also escape now escapes the window

---
 .../src/components/MkFileCaptionEditWindow.vue       | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/packages/frontend/src/components/MkFileCaptionEditWindow.vue b/packages/frontend/src/components/MkFileCaptionEditWindow.vue
index 39551e6b3c..8ff6308fb1 100644
--- a/packages/frontend/src/components/MkFileCaptionEditWindow.vue
+++ b/packages/frontend/src/components/MkFileCaptionEditWindow.vue
@@ -17,7 +17,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 	<template #header>{{ i18n.ts.describeFile }}</template>
 	<MkSpacer :marginMin="20" :marginMax="28">
 		<MkDriveFileThumbnail :file="file" fit="contain" style="height: 193px; margin-bottom: 16px;"/>
-		<MkTextarea v-model="caption" autofocus :placeholder="i18n.ts.inputNewDescription">
+		<MkTextarea v-model="caption" autofocus :placeholder="i18n.ts.inputNewDescription" @keydown="onKeydown($event)">
 			<template #label>{{ i18n.ts.caption }}</template>
 		</MkTextarea>
 	</MkSpacer>
@@ -46,6 +46,16 @@ const dialog = shallowRef<InstanceType<typeof MkModalWindow>>();
 
 const caption = ref(props.default);
 
+function onKeydown(ev: KeyboardEvent) {
+	if (ev.key === 'Enter' && (ev.ctrlKey || ev.metaKey)) ok();
+
+	if (ev.key === 'Escape') {
+		emit('closed');
+		dialog.value?.close();
+	}
+}
+
+
 async function ok() {
 	emit('done', caption.value);
 	dialog.value?.close();

From 717d22d4be85b6bfe17ea25c08c02ff102c002e3 Mon Sep 17 00:00:00 2001
From: Leah <kevinlukej@gmail.com>
Date: Mon, 26 Aug 2024 19:12:27 +0200
Subject: [PATCH 2/2] remove extra line

---
 packages/frontend/src/components/MkFileCaptionEditWindow.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/frontend/src/components/MkFileCaptionEditWindow.vue b/packages/frontend/src/components/MkFileCaptionEditWindow.vue
index 8ff6308fb1..8754c72b7b 100644
--- a/packages/frontend/src/components/MkFileCaptionEditWindow.vue
+++ b/packages/frontend/src/components/MkFileCaptionEditWindow.vue
@@ -55,7 +55,6 @@ function onKeydown(ev: KeyboardEvent) {
 	}
 }
 
-
 async function ok() {
 	emit('done', caption.value);
 	dialog.value?.close();