summaryrefslogtreecommitdiff
path: root/packages/frontend/src
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2023-11-03 08:01:22 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2023-11-03 08:01:22 +0900
commit7f5ad5badbf9574ca7183d7381333fb06cd31a15 (patch)
tree99073ad3f0179d748bd269cb26b94576dd75a22b /packages/frontend/src
parentclean up (diff)
downloadmisskey-7f5ad5badbf9574ca7183d7381333fb06cd31a15.tar.gz
misskey-7f5ad5badbf9574ca7183d7381333fb06cd31a15.tar.bz2
misskey-7f5ad5badbf9574ca7183d7381333fb06cd31a15.zip
enhance(frontend): tweak drive file component
Resolve #12220
Diffstat (limited to 'packages/frontend/src')
-rw-r--r--packages/frontend/src/components/MkDrive.file.vue7
-rw-r--r--packages/frontend/src/pages/drive.file.info.vue4
-rw-r--r--packages/frontend/src/scripts/get-drive-file-menu.ts10
3 files changed, 15 insertions, 6 deletions
diff --git a/packages/frontend/src/components/MkDrive.file.vue b/packages/frontend/src/components/MkDrive.file.vue
index 96704996f9..b46b25eba2 100644
--- a/packages/frontend/src/components/MkDrive.file.vue
+++ b/packages/frontend/src/components/MkDrive.file.vue
@@ -47,6 +47,7 @@ import { i18n } from '@/i18n.js';
import { $i } from '@/account.js';
import { useRouter } from '@/router.js';
import { getDriveFileMenu } from '@/scripts/get-drive-file-menu.js';
+import { deviceKind } from '@/scripts/device-kind.js';
const router = useRouter();
@@ -74,7 +75,11 @@ function onClick(ev: MouseEvent) {
if (props.selectMode) {
emit('chosen', props.file);
} else {
- router.push(`/my/drive/file/${props.file.id}`);
+ if (deviceKind === 'desktop') {
+ router.push(`/my/drive/file/${props.file.id}`);
+ } else {
+ os.popupMenu(getDriveFileMenu(props.file, props.folder), (ev.currentTarget ?? ev.target ?? undefined) as HTMLElement | undefined);
+ }
}
}
diff --git a/packages/frontend/src/pages/drive.file.info.vue b/packages/frontend/src/pages/drive.file.info.vue
index ae9256b8e3..1a2fc197f9 100644
--- a/packages/frontend/src/pages/drive.file.info.vue
+++ b/packages/frontend/src/pages/drive.file.info.vue
@@ -56,6 +56,10 @@ SPDX-License-Identifier: AGPL-3.0-only
<template #key>{{ i18n.ts._fileViewer.size }}</template>
<template #value>{{ bytes(file.size) }}</template>
</MkKeyValue>
+ <MkKeyValue :class="$style.fileMetaDataChildren" :copy="file.url">
+ <template #key>URL</template>
+ <template #value>{{ file.url }}</template>
+ </MkKeyValue>
</div>
</div>
<div v-else class="_fullinfo">
diff --git a/packages/frontend/src/scripts/get-drive-file-menu.ts b/packages/frontend/src/scripts/get-drive-file-menu.ts
index d1cafdf27b..23a1a77bfb 100644
--- a/packages/frontend/src/scripts/get-drive-file-menu.ts
+++ b/packages/frontend/src/scripts/get-drive-file-menu.ts
@@ -78,6 +78,11 @@ export function getDriveFileMenu(file: Misskey.entities.DriveFile, folder?: Miss
const isImage = file.type.startsWith('image/');
let menu;
menu = [{
+ type: 'link',
+ to: `/my/drive/file/${file.id}`,
+ text: i18n.ts._fileViewer.title,
+ icon: 'ti ti-info-circle',
+ }, null, {
text: i18n.ts.rename,
icon: 'ti ti-forms',
action: () => rename(file),
@@ -114,11 +119,6 @@ export function getDriveFileMenu(file: Misskey.entities.DriveFile, folder?: Miss
icon: 'ti ti-download',
download: file.name,
}, null, {
- type: 'link',
- to: `/my/drive/file/${file.id}`,
- text: i18n.ts._fileViewer.title,
- icon: 'ti ti-file',
- }, null, {
text: i18n.ts.delete,
icon: 'ti ti-trash',
danger: true,