From 1a68a9db364de9511f89d39f12d329c92a532f04 Mon Sep 17 00:00:00 2001 From: dave Date: Mon, 25 Mar 2019 14:55:58 -0400 Subject: [PATCH] #433 - Fix conversation page highlight, fetch conversation on converation page --- src/components/conversation/conversation.js | 7 ++++++- src/components/conversation/conversation.vue | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js index c57c7e06..f8887557 100644 --- a/src/components/conversation/conversation.js +++ b/src/components/conversation/conversation.js @@ -36,6 +36,11 @@ const conversation = { 'collapsable', 'isPage' ], + created () { + if (this.isPage) { + this.fetchConversation() + } + }, computed: { status () { return this.statusoid @@ -140,7 +145,7 @@ const conversation = { this.highlight = id }, getHighlight () { - return this.expanded ? this.highlight : null + return this.isExpanded ? this.highlight : null }, toggleExpanded () { this.expanded = !this.expanded diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue index 3778cc15..043f3fb3 100644 --- a/src/components/conversation/conversation.vue +++ b/src/components/conversation/conversation.vue @@ -17,7 +17,7 @@ :statusoid="status" :expandable='!expanded' :focused="focused(status.id)" - :inConversation="expanded" + :inConversation="isExpanded" :highlight="getHighlight()" :replies="getReplies(status.id)" class="status-fadein"