diff options
Diffstat (limited to 'src/client/app/desktop')
11 files changed, 39 insertions, 17 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 401a903c8a..8aa7fe1674 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 @@ -5,7 +5,7 @@ <span :class="$style.count" v-if="multiple && files.length > 0">({{ $t('chosen-files', { count: files.length }) }})</span> </span> - <mk-drive + <x-drive ref="browser" :class="$style.browser" :multiple="multiple" @@ -25,6 +25,9 @@ import Vue from 'vue'; import i18n from '../../../i18n'; export default Vue.extend({ i18n: i18n('desktop/views/components/choose-file-from-drive-window.vue'), + components: { + XDrive: () => import('./drive.vue').then(m => m.default), + }, props: { multiple: { default: false diff --git a/src/client/app/desktop/views/components/choose-folder-from-drive-window.vue b/src/client/app/desktop/views/components/choose-folder-from-drive-window.vue index 6c19480d90..e5ea7bea1e 100644 --- a/src/client/app/desktop/views/components/choose-folder-from-drive-window.vue +++ b/src/client/app/desktop/views/components/choose-folder-from-drive-window.vue @@ -4,7 +4,7 @@ <span :class="$style.title">{{ $t('choose-prompt') }}</span> </span> - <mk-drive + <x-drive ref="browser" :class="$style.browser" :multiple="false" @@ -21,6 +21,9 @@ import Vue from 'vue'; import i18n from '../../../i18n'; export default Vue.extend({ i18n: i18n('desktop/views/components/choose-folder-from-drive-window.vue'), + components: { + XDrive: () => import('./drive.vue').then(m => m.default), + }, methods: { ok() { this.$emit('selected', (this.$refs.browser as any).folder); diff --git a/src/client/app/desktop/views/components/drive-window.vue b/src/client/app/desktop/views/components/drive-window.vue index 1318762cbe..be828f53c7 100644 --- a/src/client/app/desktop/views/components/drive-window.vue +++ b/src/client/app/desktop/views/components/drive-window.vue @@ -4,7 +4,7 @@ <p v-if="usage" :class="$style.info"><b>{{ usage.toFixed(1) }}%</b> {{ $t('used') }}</p> <span :class="$style.title"><fa icon="cloud"/>{{ $t('@.drive') }}</span> </template> - <mk-drive :class="$style.browser" multiple :init-folder="folder" ref="browser"/> + <x-drive :class="$style.browser" multiple :init-folder="folder" ref="browser"/> </mk-window> </template> @@ -15,6 +15,9 @@ import { url } from '../../../config'; export default Vue.extend({ i18n: i18n('desktop/views/components/drive-window.vue'), + components: { + XDrive: () => import('./drive.vue').then(m => m.default), + }, props: ['folder'], data() { return { diff --git a/src/client/app/desktop/views/components/index.ts b/src/client/app/desktop/views/components/index.ts index 2478f75ac4..6d516c118a 100644 --- a/src/client/app/desktop/views/components/index.ts +++ b/src/client/app/desktop/views/components/index.ts @@ -16,7 +16,6 @@ import noteForm from './post-form.vue'; import renoteForm from './renote-form.vue'; import followButton from './follow-button.vue'; import notePreview from './note-preview.vue'; -import drive from './drive.vue'; import noteDetail from './note-detail.vue'; import settings from './settings.vue'; import calendar from './calendar.vue'; @@ -42,7 +41,6 @@ Vue.component('mk-post-form', noteForm); Vue.component('mk-renote-form', renoteForm); Vue.component('mk-follow-button', followButton); Vue.component('mk-note-preview', notePreview); -Vue.component('mk-drive', drive); Vue.component('mk-note-detail', noteDetail); Vue.component('mk-settings', settings); Vue.component('mk-calendar', calendar); diff --git a/src/client/app/desktop/views/components/messaging-room-window.vue b/src/client/app/desktop/views/components/messaging-room-window.vue index 90d67414ba..c1d310b8dd 100644 --- a/src/client/app/desktop/views/components/messaging-room-window.vue +++ b/src/client/app/desktop/views/components/messaging-room-window.vue @@ -1,7 +1,7 @@ <template> <mk-window ref="window" width="500px" height="560px" :popout-url="popout" @closed="destroyDom"> <span slot="header" :class="$style.header"><fa icon="comments"/>{{ $t('title') }} {{ user | userName }}</span> - <mk-messaging-room :user="user" :class="$style.content"/> + <x-messaging-room :user="user" :class="$style.content"/> </mk-window> </template> @@ -13,6 +13,9 @@ import getAcct from '../../../../../misc/acct/render'; export default Vue.extend({ i18n: i18n('desktop/views/components/messaging-room-window.vue'), + components: { + XMessagingRoom: () => import('../../../common/views/components/messaging-room.vue').then(m => m.default) + }, props: ['user'], computed: { popout(): string { diff --git a/src/client/app/desktop/views/components/messaging-window.vue b/src/client/app/desktop/views/components/messaging-window.vue index 68a04c772a..9b79fcb327 100644 --- a/src/client/app/desktop/views/components/messaging-window.vue +++ b/src/client/app/desktop/views/components/messaging-window.vue @@ -1,7 +1,7 @@ <template> <mk-window ref="window" width="500px" height="560px" @closed="destroyDom"> <span slot="header" :class="$style.header"><fa icon="comments"/>{{ $t('title') }}</span> - <mk-messaging :class="$style.content" @navigate="navigate"/> + <x-messaging :class="$style.content" @navigate="navigate"/> </mk-window> </template> @@ -12,6 +12,9 @@ import MkMessagingRoomWindow from './messaging-room-window.vue'; export default Vue.extend({ i18n: i18n('desktop/views/components/messaging-window.vue'), + components: { + XMessaging: () => import('../../../common/views/components/messaging.vue').then(m => m.default) + }, methods: { navigate(user) { this.$root.new(MkMessagingRoomWindow, { diff --git a/src/client/app/desktop/views/pages/deck/deck.vue b/src/client/app/desktop/views/pages/deck/deck.vue index ea204d0fc0..533cec8130 100644 --- a/src/client/app/desktop/views/pages/deck/deck.vue +++ b/src/client/app/desktop/views/pages/deck/deck.vue @@ -25,9 +25,6 @@ import i18n from '../../../../i18n'; import XColumnCore from './deck.column-core.vue'; import Menu from '../../../../common/views/components/menu.vue'; import MkUserListsWindow from '../../components/user-lists-window.vue'; -import XUserColumn from './deck.user-column.vue'; -import XNoteColumn from './deck.note-column.vue'; -import XHashtagColumn from './deck.hashtag-column.vue'; import * as uuid from 'uuid'; @@ -35,9 +32,9 @@ export default Vue.extend({ i18n: i18n('deck'), components: { XColumnCore, - XUserColumn, - XNoteColumn, - XHashtagColumn + XUserColumn: () => import('./deck.user-column.vue').then(m => m.default), + XNoteColumn: () => import('./deck.note-column.vue').then(m => m.default), + XHashtagColumn: () => import('./deck.hashtag-column.vue').then(m => m.default) }, computed: { diff --git a/src/client/app/desktop/views/pages/drive.vue b/src/client/app/desktop/views/pages/drive.vue index 46a3333c79..2916569a5f 100644 --- a/src/client/app/desktop/views/pages/drive.vue +++ b/src/client/app/desktop/views/pages/drive.vue @@ -1,6 +1,6 @@ <template> <div class="mk-drive-page"> - <mk-drive :init-folder="folder" @move-root="onMoveRoot" @open-folder="onOpenFolder"/> + <x-drive :init-folder="folder" @move-root="onMoveRoot" @open-folder="onOpenFolder"/> </div> </template> @@ -10,6 +10,9 @@ import i18n from '../../../i18n'; export default Vue.extend({ i18n: i18n('desktop/views/pages/drive.vue'), + components: { + XDrive: () => import('../components/drive.vue').then(m => m.default), + }, data() { return { folder: null diff --git a/src/client/app/desktop/views/pages/messaging-room.vue b/src/client/app/desktop/views/pages/messaging-room.vue index 8bb3976e5f..5bc28947cb 100644 --- a/src/client/app/desktop/views/pages/messaging-room.vue +++ b/src/client/app/desktop/views/pages/messaging-room.vue @@ -1,6 +1,6 @@ <template> <div class="mk-messaging-room-page"> - <mk-messaging-room v-if="user" :user="user" :is-naked="true"/> + <x-messaging-room v-if="user" :user="user" :is-naked="true"/> </div> </template> @@ -13,6 +13,9 @@ import getUserName from '../../../../../misc/get-user-name'; export default Vue.extend({ i18n: i18n('.vue'), + components: { + XMessagingRoom: () => import('../../../common/views/components/messaging-room.vue').then(m => m.default) + }, data() { return { fetching: true, diff --git a/src/client/app/desktop/views/pages/selectdrive.vue b/src/client/app/desktop/views/pages/selectdrive.vue index 422acb9890..7e6a8e1937 100644 --- a/src/client/app/desktop/views/pages/selectdrive.vue +++ b/src/client/app/desktop/views/pages/selectdrive.vue @@ -1,6 +1,6 @@ <template> <div class="mkp-selectdrive"> - <mk-drive ref="browser" + <x-drive ref="browser" :multiple="multiple" @selected="onSelected" @change-selection="onChangeSelection" @@ -19,6 +19,9 @@ import i18n from '../../../i18n'; export default Vue.extend({ i18n: i18n('desktop/views/pages/selectdrive.vue'), + components: { + XDrive: () => import('../components/drive.vue').then(m => m.default), + }, data() { return { files: [] diff --git a/src/client/app/desktop/views/widgets/messaging.vue b/src/client/app/desktop/views/widgets/messaging.vue index 887240be85..77088d8ad6 100644 --- a/src/client/app/desktop/views/widgets/messaging.vue +++ b/src/client/app/desktop/views/widgets/messaging.vue @@ -4,7 +4,7 @@ <template slot="header"><fa icon="comments"/>{{ $t('title') }}</template> <button slot="func" @click="add"><fa icon="plus"/></button> - <mk-messaging ref="index" compact @navigate="navigate"/> + <x-messaging ref="index" compact @navigate="navigate"/> </mk-widget-container> </div> </template> @@ -22,6 +22,9 @@ export default define({ }) }).extend({ i18n: i18n('desktop/views/widgets/messaging.vue'), + components: { + XMessaging: () => import('../../../common/views/components/messaging.vue').then(m => m.default) + }, methods: { navigate(user) { this.$root.new(MkMessagingRoomWindow, { |