diff options
| author | MeiMei <30769358+mei23@users.noreply.github.com> | 2019-07-04 14:31:30 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2019-07-04 14:31:30 +0900 |
| commit | 97002400a8d59fc8a7a9810e9edadc849685dd5d (patch) | |
| tree | a3a139889c0303a8020b740d017d7ef6b4e737d3 /src/client/app/desktop/views | |
| parent | Fix MIME (diff) | |
| download | sharkey-97002400a8d59fc8a7a9810e9edadc849685dd5d.tar.gz sharkey-97002400a8d59fc8a7a9810e9edadc849685dd5d.tar.bz2 sharkey-97002400a8d59fc8a7a9810e9edadc849685dd5d.zip | |
アバターファイル選択でimage以外は表示しないように (#5098)
Diffstat (limited to 'src/client/app/desktop/views')
| -rw-r--r-- | src/client/app/desktop/views/components/choose-file-from-drive-window.vue | 6 | ||||
| -rw-r--r-- | src/client/app/desktop/views/components/drive.vue | 7 |
2 files changed, 13 insertions, 0 deletions
diff --git a/src/client/app/desktop/views/components/choose-file-from-drive-window.vue b/src/client/app/desktop/views/components/choose-file-from-drive-window.vue index 8b39e6e00b..71c430edeb 100644 --- a/src/client/app/desktop/views/components/choose-file-from-drive-window.vue +++ b/src/client/app/desktop/views/components/choose-file-from-drive-window.vue @@ -11,6 +11,7 @@ <x-drive ref="browser" class="browser" + :type="type" :multiple="multiple" @selected="onSelected" @change-selection="onChangeSelection" @@ -33,6 +34,11 @@ export default Vue.extend({ XDrive: () => import('./drive.vue').then(m => m.default), }, props: { + type: { + type: String, + required: false, + default: undefined + }, multiple: { default: false } diff --git a/src/client/app/desktop/views/components/drive.vue b/src/client/app/desktop/views/components/drive.vue index 4b64d4f22a..2eb9581359 100644 --- a/src/client/app/desktop/views/components/drive.vue +++ b/src/client/app/desktop/views/components/drive.vue @@ -80,6 +80,11 @@ export default Vue.extend({ type: Object, required: false }, + type: { + type: String, + required: false, + default: undefined + }, multiple: { type: Boolean, default: false @@ -540,6 +545,7 @@ export default Vue.extend({ // ファイル一覧取得 this.$root.api('drive/files', { folderId: this.folder ? this.folder.id : null, + type: this.type, limit: filesMax + 1 }).then(files => { if (files.length == filesMax + 1) { @@ -570,6 +576,7 @@ export default Vue.extend({ // ファイル一覧取得 this.$root.api('drive/files', { folderId: this.folder ? this.folder.id : null, + type: this.type, untilId: this.files[this.files.length - 1].id, limit: max + 1 }).then(files => { |