diff --git a/src/web/app/desktop/-tags/drive/file.tag b/src/web/app/desktop/-tags/drive/file.tag deleted file mode 100644 index 153a038f47..0000000000 --- a/src/web/app/desktop/-tags/drive/file.tag +++ /dev/null @@ -1,217 +0,0 @@ - -
-

%i18n:desktop.tags.mk-drive-browser-file.avatar%

-
-
-

%i18n:desktop.tags.mk-drive-browser-file.banner%

-
-
- -
-

{ file.name.lastIndexOf('.') != -1 ? file.name.substr(0, file.name.lastIndexOf('.')) : file.name }{ file.name.substr(file.name.lastIndexOf('.')) }

- - -
diff --git a/src/web/app/desktop/-tags/drive/folder.tag b/src/web/app/desktop/-tags/drive/folder.tag deleted file mode 100644 index ed16bfb0d7..0000000000 --- a/src/web/app/desktop/-tags/drive/folder.tag +++ /dev/null @@ -1,202 +0,0 @@ - -

{ folder.name }

- - -
diff --git a/src/web/app/desktop/views/components/drive-file.vue b/src/web/app/desktop/views/components/drive-file.vue new file mode 100644 index 0000000000..cda561d31b --- /dev/null +++ b/src/web/app/desktop/views/components/drive-file.vue @@ -0,0 +1,232 @@ + + + + + diff --git a/src/web/app/desktop/views/components/drive-folder.vue b/src/web/app/desktop/views/components/drive-folder.vue new file mode 100644 index 0000000000..e9e4f1de2c --- /dev/null +++ b/src/web/app/desktop/views/components/drive-folder.vue @@ -0,0 +1,220 @@ + + + + + diff --git a/src/web/app/desktop/views/components/post-form-window.vue b/src/web/app/desktop/views/components/post-form-window.vue index 90e694c922..39e89ca44b 100644 --- a/src/web/app/desktop/views/components/post-form-window.vue +++ b/src/web/app/desktop/views/components/post-form-window.vue @@ -29,7 +29,9 @@ export default Vue.extend({ }; }, mounted() { - (this.$refs.form as any).focus(); + Vue.nextTick(() => { + (this.$refs.form as any).focus(); + }); }, methods: { onChangeUploadings(media) { diff --git a/src/web/app/desktop/views/components/post-form.vue b/src/web/app/desktop/views/components/post-form.vue index 9efca5ddc8..c062c57e10 100644 --- a/src/web/app/desktop/views/components/post-form.vue +++ b/src/web/app/desktop/views/components/post-form.vue @@ -111,7 +111,7 @@ export default Vue.extend({ chooseFile() { (this.$refs.file as any).click(); }, - chooseFileFromDrive() { + chooseFileFromDrive() {/* const w = new MkDriveFileSelectorWindow({ propsData: { multiple: true @@ -122,7 +122,7 @@ export default Vue.extend({ w.$once('selected', files => { files.forEach(this.attachMedia); - }); + });*/ }, attachMedia(driveFile) { this.files.push(driveFile);