From a95878ba1b8e742ccb5df2965a45c197f1c6949c Mon Sep 17 00:00:00 2001
From: kakkokari-gtyih <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sat, 24 May 2025 19:00:44 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=E3=82=AF=E3=83=AA=E3=83=83=E3=83=97?=
=?UTF-8?q?=E3=83=9C=E3=83=BC=E3=83=89=E8=B2=BC=E3=82=8A=E4=BB=98=E3=81=91?=
=?UTF-8?q?=E6=99=82=E3=82=82=E3=82=A2=E3=83=83=E3=83=97=E3=83=AD=E3=83=BC?=
=?UTF-8?q?=E3=83=89=E3=83=80=E3=82=A4=E3=82=A2=E3=83=AD=E3=82=B0=E3=81=8C?=
=?UTF-8?q?=E5=87=BA=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E3=81=AA=E3=81=A3?=
=?UTF-8?q?=E3=81=9F=E3=81=AE=E3=81=A7=E5=AF=BE=E5=BF=9C=E3=81=99=E3=82=8B?=
=?UTF-8?q?=E8=A8=AD=E5=AE=9A=E9=A0=85=E7=9B=AE=E3=82=92=E5=89=8A=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
packages/frontend/src/pages/settings/drive.vue | 9 ---------
packages/frontend/src/preferences/def.ts | 3 ---
2 files changed, 12 deletions(-)
diff --git a/packages/frontend/src/pages/settings/drive.vue b/packages/frontend/src/pages/settings/drive.vue
index 5763e3a33b..48b189302c 100644
--- a/packages/frontend/src/pages/settings/drive.vue
+++ b/packages/frontend/src/pages/settings/drive.vue
@@ -65,12 +65,6 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts.useWatermark }}
{{ i18n.ts.useWatermarkDescription }}
-
-
- {{ i18n.ts._watermarkEditor.clipboardUploadBehavior }}
-
-
-
@@ -116,7 +110,6 @@ import tinycolor from 'tinycolor2';
import FormLink from '@/components/form/link.vue';
import MkFolder from '@/components/MkFolder.vue';
import MkInfo from '@/components/MkInfo.vue';
-import MkSelect from '@/components/MkSelect.vue';
import MkSwitch from '@/components/MkSwitch.vue';
import FormSection from '@/components/form/section.vue';
import MkKeyValue from '@/components/MkKeyValue.vue';
@@ -156,13 +149,11 @@ const meterStyle = computed(() => {
});
const useWatermark = prefer.model('useWatermark');
-const clipboardWatermarkBehavior = prefer.model('clipboardWatermarkBehavior');
const keepOriginalFilename = prefer.model('keepOriginalFilename');
watch([
useWatermark,
- clipboardWatermarkBehavior,
], () => {
reloadAsk({ unison: true, reason: i18n.ts.reloadRequiredToApplySettings });
});
diff --git a/packages/frontend/src/preferences/def.ts b/packages/frontend/src/preferences/def.ts
index bb4469c561..6dede1f7f3 100644
--- a/packages/frontend/src/preferences/def.ts
+++ b/packages/frontend/src/preferences/def.ts
@@ -353,9 +353,6 @@ export const PREF_DEF = {
useWatermark: {
default: false,
},
- clipboardWatermarkBehavior: {
- default: 'default' as 'default' | 'confirm',
- },
watermarkConfig: {
accountDependent: true,
default: null as WatermarkConfig | null,