From 204d4dfe31cb2c5e25f25a6c1bf37776eb6cd6e8 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Tue, 20 Feb 2018 23:37:35 +0900
Subject: [PATCH] wip
---
src/web/app/desktop/script.ts | 8 ++++++++
src/web/app/desktop/views/components/drive-window.vue | 2 +-
src/web/app/desktop/views/components/window.vue | 2 +-
src/web/app/desktop/views/pages/drive.vue | 11 +++++++++--
4 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/src/web/app/desktop/script.ts b/src/web/app/desktop/script.ts
index 251a2a1619..cf725d27c6 100644
--- a/src/web/app/desktop/script.ts
+++ b/src/web/app/desktop/script.ts
@@ -18,6 +18,8 @@ import post from './api/post';
import MkIndex from './views/pages/index.vue';
import MkUser from './views/pages/user/user.vue';
+import MkSelectDrive from './views/pages/selectdrive.vue';
+import MkDrive from './views/pages/drive.vue';
/**
* init
@@ -58,6 +60,12 @@ init(async (launch) => {
app.$router.addRoutes([{
path: '/', component: MkIndex
+ }, {
+ path: '/i/drive', component: MkDrive
+ }, {
+ path: '/i/drive/folder/:folder', component: MkDrive
+ }, {
+ path: '/selectdrive', component: MkSelectDrive
}, {
path: '/:user', component: MkUser
}]);
diff --git a/src/web/app/desktop/views/components/drive-window.vue b/src/web/app/desktop/views/components/drive-window.vue
index 9fd5df8307..8ae48cf39f 100644
--- a/src/web/app/desktop/views/components/drive-window.vue
+++ b/src/web/app/desktop/views/components/drive-window.vue
@@ -1,5 +1,5 @@
<template>
-<mk-window ref="window" @closed="$destroy" width="800px" height="500px" :popout="popout">
+<mk-window ref="window" @closed="$destroy" width="800px" height="500px" :popout-url="popout">
<template slot="header">
<p v-if="usage" :class="$style.info"><b>{{ usage.toFixed(1) }}%</b> %i18n:desktop.tags.mk-drive-browser-window.used%</p>
<span :class="$style.title">%fa:cloud%%i18n:desktop.tags.mk-drive-browser-window.drive%</span>
diff --git a/src/web/app/desktop/views/components/window.vue b/src/web/app/desktop/views/components/window.vue
index 7f7f778131..1dba9a25aa 100644
--- a/src/web/app/desktop/views/components/window.vue
+++ b/src/web/app/desktop/views/components/window.vue
@@ -563,7 +563,7 @@ export default Vue.extend({
margin 0
padding 0
cursor pointer
- font-size 1.2em
+ font-size 1em
color rgba(#000, 0.4)
border none
outline none
diff --git a/src/web/app/desktop/views/pages/drive.vue b/src/web/app/desktop/views/pages/drive.vue
index 3ce5af7697..353f59b703 100644
--- a/src/web/app/desktop/views/pages/drive.vue
+++ b/src/web/app/desktop/views/pages/drive.vue
@@ -1,13 +1,20 @@
<template>
<div class="mk-drive-page">
- <mk-drive :folder="folder" @move-root="onMoveRoot" @open-folder="onOpenFolder"/>
+ <mk-drive :init-folder="folder" @move-root="onMoveRoot" @open-folder="onOpenFolder"/>
</div>
</template>
<script lang="ts">
import Vue from 'vue';
export default Vue.extend({
- props: ['folder'],
+ data() {
+ return {
+ folder: null
+ };
+ },
+ created() {
+ this.folder = this.$route.params.folder;
+ },
mounted() {
document.title = 'Misskey Drive';
},