From 0f8847bb747d71ad4ea045128e4e968883bc8556 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 14 Oct 2018 09:47:38 +0900 Subject: [PATCH] Resolve #2618 --- package.json | 1 + .../app/common/views/components/index.ts | 2 + .../common/views/components/note-skeleton.vue | 52 +++++++++++++++++++ .../views/components/ellipsis-icon.vue | 37 ------------- .../app/desktop/views/components/index.ts | 2 - .../app/desktop/views/components/notes.vue | 10 ++++ .../views/components/notifications.vue | 20 +++---- .../views/components/timeline.core.vue | 8 --- src/client/app/desktop/views/pages/search.vue | 6 --- src/client/app/desktop/views/pages/tag.vue | 6 --- .../views/pages/user/user.timeline.vue | 6 --- .../app/mobile/views/components/notes.vue | 17 +++--- .../mobile/views/components/notifications.vue | 17 +++--- 13 files changed, 94 insertions(+), 90 deletions(-) create mode 100644 src/client/app/common/views/components/note-skeleton.vue delete mode 100644 src/client/app/desktop/views/components/ellipsis-icon.vue diff --git a/package.json b/package.json index deb384c14..21deea51d 100644 --- a/package.json +++ b/package.json @@ -213,6 +213,7 @@ "vue": "2.5.17", "vue-chartjs": "3.4.0", "vue-color": "2.7.0", + "vue-content-loading": "1.5.3", "vue-cropperjs": "2.2.2", "vue-js-modal": "1.3.26", "vue-json-tree-view": "2.1.4", diff --git a/src/client/app/common/views/components/index.ts b/src/client/app/common/views/components/index.ts index 0dea38a7a..e2b9089d3 100644 --- a/src/client/app/common/views/components/index.ts +++ b/src/client/app/common/views/components/index.ts @@ -1,5 +1,6 @@ import Vue from 'vue'; +import noteSkeleton from './note-skeleton.vue'; import theme from './theme.vue'; import instance from './instance.vue'; import cwButton from './cw-button.vue'; @@ -44,6 +45,7 @@ import uiSelect from './ui/select.vue'; import formButton from './ui/form/button.vue'; import formRadio from './ui/form/radio.vue'; +Vue.component('mk-note-skeleton', noteSkeleton); Vue.component('mk-theme', theme); Vue.component('mk-instance', instance); Vue.component('mk-cw-button', cwButton); diff --git a/src/client/app/common/views/components/note-skeleton.vue b/src/client/app/common/views/components/note-skeleton.vue new file mode 100644 index 000000000..a2e09e322 --- /dev/null +++ b/src/client/app/common/views/components/note-skeleton.vue @@ -0,0 +1,52 @@ + + + diff --git a/src/client/app/desktop/views/components/ellipsis-icon.vue b/src/client/app/desktop/views/components/ellipsis-icon.vue deleted file mode 100644 index 4a5a0f23d..000000000 --- a/src/client/app/desktop/views/components/ellipsis-icon.vue +++ /dev/null @@ -1,37 +0,0 @@ - - - diff --git a/src/client/app/desktop/views/components/index.ts b/src/client/app/desktop/views/components/index.ts index 7b7a38afa..38b154744 100644 --- a/src/client/app/desktop/views/components/index.ts +++ b/src/client/app/desktop/views/components/index.ts @@ -9,7 +9,6 @@ import subNoteContent from './sub-note-content.vue'; import window from './window.vue'; import noteFormWindow from './post-form-window.vue'; import renoteFormWindow from './renote-form-window.vue'; -import ellipsisIcon from './ellipsis-icon.vue'; import mediaImage from './media-image.vue'; import mediaImageDialog from './media-image-dialog.vue'; import mediaVideo from './media-video.vue'; @@ -39,7 +38,6 @@ Vue.component('mk-sub-note-content', subNoteContent); Vue.component('mk-window', window); Vue.component('mk-post-form-window', noteFormWindow); Vue.component('mk-renote-form-window', renoteFormWindow); -Vue.component('mk-ellipsis-icon', ellipsisIcon); Vue.component('mk-media-image', mediaImage); Vue.component('mk-media-image-dialog', mediaImageDialog); Vue.component('mk-media-video', mediaVideo); diff --git a/src/client/app/desktop/views/components/notes.vue b/src/client/app/desktop/views/components/notes.vue index 84b13ed84..b43720d19 100644 --- a/src/client/app/desktop/views/components/notes.vue +++ b/src/client/app/desktop/views/components/notes.vue @@ -9,6 +9,12 @@ +
+ +
+