usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

migrate

This commit is contained in:
kakkokari-gtyih 2025-05-24 18:42:16 +09:00
parent 8fe629ce43
commit 6d7f49b0d3
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/frontend/src/components/MkWatermarkEditorDialog.anchor.vue
View File

@ -16,8 +16,8 @@ SPDX-License-Identifier: AGPL-3.0-only
<script setup lang="ts"> <script setup lang="ts">
import { useId } from 'vue'; import { useId } from 'vue';
import { i18n } from '@/i18n.js'; import { i18n } from '@/i18n.js';
import { watermarkAnchor } from '@/scripts/watermark.js'; import { watermarkAnchor } from '@/utility/watermark.js';
import type { WatermarkAnchor } from '@/scripts/watermark.js'; import type { WatermarkAnchor } from '@/utility/watermark.js';
const langMap = { const langMap = {
'top': i18n.ts.centerTop, 'top': i18n.ts.centerTop,

10
packages/frontend/src/components/MkWatermarkEditorDialog.vue
View File

@ -111,11 +111,11 @@ import XPaddingView from '@/components/MkWatermarkEditorDialog.padding.vue';
import * as os from '@/os.js'; import * as os from '@/os.js';
import { defaultStore } from '@/store.js'; import { defaultStore } from '@/store.js';
import { i18n } from '@/i18n.js'; import { i18n } from '@/i18n.js';
import { selectFile } from '@/scripts/select-file.js'; import { selectFile } from '@/utility/select-file.js';
import { applyWatermark, canApplyWatermark } from '@/scripts/watermark.js'; import { applyWatermark, canApplyWatermark } from '@/utility/watermark.js';
import { misskeyApi } from '@/scripts/misskey-api.js'; import { misskeyApi } from '@/utility/misskey-api.js';
import type { WatermarkUserConfig } from '@/scripts/watermark.js'; import type { WatermarkUserConfig } from '@/utility/watermark.js';
const emit = defineEmits<{ const emit = defineEmits<{
(ev: 'ok'): void; (ev: 'ok'): void;
@ -279,7 +279,7 @@ onMounted(() => {
watch(watermarkConfig, (watermarkConfigTo) => { watch(watermarkConfig, (watermarkConfigTo) => {
canvasLoading.value = true; canvasLoading.value = true;
if (canvasEl.value) { if (canvasEl.value) {
// @/scripts/watermark.ts の DEFAULT_ASPECT_RATIO と同じ縦横比の画像を使用すること // @/utility/watermark.ts の DEFAULT_ASPECT_RATIO と同じ縦横比の画像を使用すること
applyWatermark('/client-assets/hill.webp', canvasEl.value, canApplyWatermark(watermarkConfigTo) ? watermarkConfigTo : null).then(() => { applyWatermark('/client-assets/hill.webp', canvasEl.value, canApplyWatermark(watermarkConfigTo) ? watermarkConfigTo : null).then(() => {
canvasLoading.value = false; canvasLoading.value = false;
}); });