diff options
| author | dave <starpumadev@gmail.com> | 2019-03-25 10:50:09 -0400 |
|---|---|---|
| committer | dave <starpumadev@gmail.com> | 2019-03-25 10:50:09 -0400 |
| commit | 6a9159b25598d578018643673568bbcd06ea1e12 (patch) | |
| tree | 4fab0d4f99ec681542527c9d8ac70f2704251da7 /src/components/conversation | |
| parent | 4cec0d589dfc54987ec6f024b0a463d0abd847d2 (diff) | |
#433 - fix broken conversation page
Diffstat (limited to 'src/components/conversation')
| -rw-r--r-- | src/components/conversation/conversation.js | 8 | ||||
| -rw-r--r-- | src/components/conversation/conversation.vue | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js index 4cae0bdb..5a9568a9 100644 --- a/src/components/conversation/conversation.js +++ b/src/components/conversation/conversation.js @@ -31,7 +31,8 @@ const conversation = { }, props: [ 'statusoid', - 'collapsable' + 'collapsable', + 'isPage' ], computed: { status () { @@ -49,7 +50,7 @@ const conversation = { return [] } - if (!this.expanded) { + if (!this.expanded && !this.isPage) { return [this.status] } @@ -79,6 +80,9 @@ const conversation = { i++ return result }, {}) + }, + isExpanded () { + return this.expanded || this.isPage } }, components: { diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue index b208d540..3778cc15 100644 --- a/src/components/conversation/conversation.vue +++ b/src/components/conversation/conversation.vue @@ -1,6 +1,6 @@ <template> - <div class="timeline panel-default" :class="[expanded ? 'panel' : 'panel-disabled']"> - <div v-if="expanded" class="panel-heading conversation-heading"> + <div class="timeline panel-default" :class="[isExpanded ? 'panel' : 'panel-disabled']"> + <div v-if="isExpanded" class="panel-heading conversation-heading"> <span class="title"> {{ $t('timeline.conversation') }} </span> <span v-if="collapsable"> <a href="#" @click.prevent="toggleExpanded">{{ $t('timeline.collapse') }}</a> |
