usbharu
/
misskey
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

責務の修正

This commit is contained in:
FruitRiin 2023-11-25 04:02:27 +09:00
parent f97d1e73d7
commit 63959c20ad
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/frontend/src/components/MkDrive.vue
View File

@ -107,7 +107,6 @@ import { defaultStore } from '@/store.js';
import { i18n } from '@/i18n.js'; import { i18n } from '@/i18n.js';
import { uploadFile, uploads } from '@/scripts/upload.js'; import { uploadFile, uploads } from '@/scripts/upload.js';
import { claimAchievement } from '@/scripts/achievements.js'; import { claimAchievement } from '@/scripts/achievements.js';
import { mainRouter, useRouter } from '@/router.js';
const props = withDefaults(defineProps<{ const props = withDefaults(defineProps<{
initialFolder?: Misskey.entities.DriveFolder; initialFolder?: Misskey.entities.DriveFolder;
@ -154,7 +153,6 @@ const fetching = ref(true);
const ilFilesObserver = new IntersectionObserver( const ilFilesObserver = new IntersectionObserver(
(entries) => entries.some((entry) => entry.isIntersecting) && !fetching.value && moreFiles.value && fetchMoreFiles(), (entries) => entries.some((entry) => entry.isIntersecting) && !fetching.value && moreFiles.value && fetchMoreFiles(),
); );
const router = useRouter();
watch(folder, () => emit('cd', folder.value)); watch(folder, () => emit('cd', folder.value));
@ -431,15 +429,9 @@ function chooseFolder(folderToChoose: Misskey.entities.DriveFolder) {
function move(target?: Misskey.entities.DriveFolder) { function move(target?: Misskey.entities.DriveFolder) {
if (!target) { if (!target) {
goRoot(); goRoot();
// メインルーターならURLだけ書き換え
if (router === mainRouter) history.pushState({}, '', '/my/drive/');
return; return;
} else if (typeof target === 'object') { } else if (typeof target === 'object') {
target = target.id; target = target.id;
// メインルーターならURLだけ書き換え
if (router === mainRouter) {
history.pushState({}, '', `/my/drive/folder/${target}`);
}
} }
fetching.value = true; fetching.value = true;

22
packages/frontend/src/pages/drive.vue
View File

@ -5,15 +5,16 @@ SPDX-License-Identifier: AGPL-3.0-only
<template> <template>
<div> <div>
<XDrive ref="drive" :initialFolder="props.folder" @cd="x => folder = x"/> <XDrive ref="drive" :initialFolder="props.folder" @cd="cd"/>
</div> </div>
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { computed, onActivated, onDeactivated } from 'vue'; import { computed, onActivated } from 'vue';
import XDrive from '@/components/MkDrive.vue'; import XDrive from '@/components/MkDrive.vue';
import { i18n } from '@/i18n.js'; import { i18n } from '@/i18n.js';
import { definePageMetadata } from '@/scripts/page-metadata.js'; import { definePageMetadata } from '@/scripts/page-metadata.js';
import { mainRouter, useRouter } from '@/router.js';
const props = withDefaults(defineProps<{ const props = withDefaults(defineProps<{
folder?: string; folder?: string;
@ -23,12 +24,27 @@ const props = withDefaults(defineProps<{
let folder = $ref(null); let folder = $ref(null);
// 別のルートから飛んできたらそれはルートディレクトリを開く
let drive = $ref(null); let drive = $ref(null);
// 別のルートから飛んできたらそれはルートディレクトリを開く
onActivated(() => { onActivated(() => {
if (drive) drive.goRoot(); if (drive) drive.goRoot();
}); });
const router = useRouter();
function cd(x) {
folder = x;
// メインルーターならURLだけ書き換え
if (router === mainRouter) {
if (folder === null) {
history.pushState({}, '', '/my/drive/');
} else {
history.pushState({}, '', `/my/drive/folder/${folder.id}`);
}
}
}
const headerActions = $computed(() => []); const headerActions = $computed(() => []);
const headerTabs = $computed(() => []); const headerTabs = $computed(() => []);