From 3dd3d06b1925c9c4cbfc0e9a3cb3205af17e3e9f Mon Sep 17 00:00:00 2001 From: syuilo Date: Mon, 13 Mar 2017 14:56:53 +0900 Subject: [PATCH] [Client] :v: --- src/web/app/common/tags/uploader.tag | 2 + src/web/app/mobile/tags/drive.tag | 87 +++++++++++++++++++ src/web/app/mobile/tags/drive/file-viewer.tag | 4 +- src/web/app/mobile/tags/page/drive.tag | 4 + 4 files changed, 94 insertions(+), 3 deletions(-) diff --git a/src/web/app/common/tags/uploader.tag b/src/web/app/common/tags/uploader.tag index d40ac0a6a0..845cd9d127 100644 --- a/src/web/app/common/tags/uploader.tag +++ b/src/web/app/common/tags/uploader.tag @@ -145,6 +145,8 @@ this.uploads = []; this.upload = (file, folder) => { + if (folder && typeof folder == 'object') folder = folder.id; + const id = Math.random(); const ctx = { diff --git a/src/web/app/mobile/tags/drive.tag b/src/web/app/mobile/tags/drive.tag index 307caa4707..f1a9bf9f43 100644 --- a/src/web/app/mobile/tags/drive.tag +++ b/src/web/app/mobile/tags/drive.tag @@ -14,6 +14,7 @@

{ file.name }

+
0 }> @@ -38,6 +39,7 @@
+ diff --git a/src/web/app/mobile/tags/drive/file-viewer.tag b/src/web/app/mobile/tags/drive/file-viewer.tag index ca8d912c67..cfa77dcb91 100644 --- a/src/web/app/mobile/tags/drive/file-viewer.tag +++ b/src/web/app/mobile/tags/drive/file-viewer.tag @@ -203,9 +203,7 @@ }; this.move = () => { - const dialog = riot.mount(document.body.appendChild(document.createElement('mk-drive-folder-selector')), { - multiple: true - })[0]; + const dialog = riot.mount(document.body.appendChild(document.createElement('mk-drive-folder-selector')))[0]; dialog.one('selected', folder => { this.api('drive/files/update', { file_id: this.file.id, diff --git a/src/web/app/mobile/tags/page/drive.tag b/src/web/app/mobile/tags/page/drive.tag index 577f47ec78..bacfa25826 100644 --- a/src/web/app/mobile/tags/page/drive.tag +++ b/src/web/app/mobile/tags/page/drive.tag @@ -14,6 +14,10 @@ document.title = 'Misskey Drive'; this.ui.trigger('title', 'ドライブ'); + this.ui.trigger('func', () => { + this.refs.ui.refs.browser.openContextMenu(); + }, 'ellipsis-h'); + this.refs.ui.refs.browser.on('begin-fetch', () => { this.Progress.start(); });