From 1d02d9e0feab04b48950207123f11f1decbec473 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 2 Mar 2019 08:06:03 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=A2=E3=83=90=E3=82=A4=E3=83=AB=E3=81=AE?= =?UTF-8?q?=E3=83=87=E3=83=83=E3=82=AD=E3=81=A7=E8=BF=94=E4=BF=A1=E3=81=8C?= =?UTF-8?q?=E8=A1=A8=E7=A4=BA=E3=81=95=E3=82=8C=E3=81=AA=E3=81=84=E5=95=8F?= =?UTF-8?q?=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/views/deck/deck.note-column.vue | 4 +-- .../app/desktop/views/components/note.vue | 8 ++--- .../app/mobile/views/components/note.vue | 31 +++++++++++++++++++ 3 files changed, 34 insertions(+), 9 deletions(-) diff --git a/src/client/app/common/views/deck/deck.note-column.vue b/src/client/app/common/views/deck/deck.note-column.vue index ca798707b..ddc3860d3 100644 --- a/src/client/app/common/views/deck/deck.note-column.vue +++ b/src/client/app/common/views/deck/deck.note-column.vue @@ -11,7 +11,7 @@ {{ $t('@.view-on-remote') }} - + @@ -20,13 +20,11 @@ import Vue from 'vue'; import i18n from '../../../i18n'; import XColumn from './deck.column.vue'; -import XNotes from './deck.notes.vue'; export default Vue.extend({ i18n: i18n(), components: { XColumn, - XNotes, }, data() { diff --git a/src/client/app/desktop/views/components/note.vue b/src/client/app/desktop/views/components/note.vue index 90454dbad..9dc831db7 100644 --- a/src/client/app/desktop/views/components/note.vue +++ b/src/client/app/desktop/views/components/note.vue @@ -7,9 +7,7 @@ v-hotkey="keymap" :title="title" > -
- -
+
@@ -69,9 +67,7 @@
{{ $t('deleted') }}
-
- -
+ diff --git a/src/client/app/mobile/views/components/note.vue b/src/client/app/mobile/views/components/note.vue index 1d056c126..de556f170 100644 --- a/src/client/app/mobile/views/components/note.vue +++ b/src/client/app/mobile/views/components/note.vue @@ -6,6 +6,7 @@ :class="{ renote: isRenote, smart: $store.state.device.postStyle == 'smart', mini: narrow }" v-hotkey="keymap" > +
@@ -62,6 +63,7 @@
{{ $t('deleted') }}
+ @@ -91,6 +93,11 @@ export default Vue.extend({ type: Object, required: true }, + detail: { + type: Boolean, + required: false, + default: false + }, }, inject: { @@ -98,6 +105,30 @@ export default Vue.extend({ default: false } }, + + data() { + return { + conversation: [], + replies: [] + }; + }, + + created() { + if (this.detail) { + this.$root.api('notes/replies', { + noteId: this.appearNote.id, + limit: 8 + }).then(replies => { + this.replies = replies; + }); + + this.$root.api('notes/conversation', { + noteId: this.appearNote.replyId + }).then(conversation => { + this.conversation = conversation.reverse(); + }); + } + } });