Troplo/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

#433 - fix broken conversation page

Browse source
This commit is contained in:
dave 2019-03-25 10:50:09 -04:00
parent 4cec0d589d
commit 6a9159b255
3 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/components/conversation-page/conversation-page.vue
View file

@ -1,5 +1,9 @@
<template> <template>
<conversation :collapsable="false" :statusoid="statusoid"></conversation> <conversation
:collapsable="false"
isPage="true"
:statusoid="statusoid"
></conversation>
</template> </template>
<script src="./conversation-page.js"></script> <script src="./conversation-page.js"></script>

8
src/components/conversation/conversation.js
View file

@ -31,7 +31,8 @@ const conversation = {
}, },
props: [ props: [
'statusoid', 'statusoid',
'collapsable' 'collapsable',
'isPage'
], ],
computed: { computed: {
status () { status () {
@ -49,7 +50,7 @@ const conversation = {
return [] return []
} }
if (!this.expanded) { if (!this.expanded && !this.isPage) {
return [this.status] return [this.status]
} }
@ -79,6 +80,9 @@ const conversation = {
i++ i++
return result return result
}, {}) }, {})
},
isExpanded () {
return this.expanded || this.isPage
} }
}, },
components: { components: {

4
src/components/conversation/conversation.vue
View file

@ -1,6 +1,6 @@
<template> <template>
<div class="timeline panel-default" :class="[expanded ? 'panel' : 'panel-disabled']"> <div class="timeline panel-default" :class="[isExpanded ? 'panel' : 'panel-disabled']">
<div v-if="expanded" class="panel-heading conversation-heading"> <div v-if="isExpanded" class="panel-heading conversation-heading">
<span class="title"> {{ $t('timeline.conversation') }} </span> <span class="title"> {{ $t('timeline.conversation') }} </span>
<span v-if="collapsable"> <span v-if="collapsable">
<a href="#" @click.prevent="toggleExpanded">{{ $t('timeline.collapse') }}</a> <a href="#" @click.prevent="toggleExpanded">{{ $t('timeline.collapse') }}</a>