sjw
/
pleroma-fe
mirror of https://git.pleroma.social/sjw/pleroma-fe.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert "eliminate expandable prop in favor of inConversation" 

This reverts commit 1455e1f9d5.
This commit is contained in:
taehoon 2019-05-06 21:36:55 -04:00
parent 134b1894d6
commit 917e82e8ee
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/components/conversation/conversation.vue
View File

@ -13,6 +13,7 @@
:key="status.id" :key="status.id"
:inlineExpanded="collapsable && isExpanded" :inlineExpanded="collapsable && isExpanded"
:statusoid="status" :statusoid="status"
:expandable='!isExpanded'
:focused="focused(status.id)" :focused="focused(status.id)"
:inConversation="isExpanded" :inConversation="isExpanded"
:highlight="getHighlight()" :highlight="getHighlight()"

1
src/components/status/status.js
View File

@ -18,6 +18,7 @@ const Status = {
name: 'Status', name: 'Status',
props: [ props: [
'statusoid', 'statusoid',
'expandable',
'inConversation', 'inConversation',
'focused', 'focused',
'highlight', 'highlight',

2
src/components/status/status.vue
View File

@ -52,7 +52,7 @@
<a :href="status.external_url" target="_blank" v-if="!status.is_local && !isPreview" class="source_url" title="Source"> <a :href="status.external_url" target="_blank" v-if="!status.is_local && !isPreview" class="source_url" title="Source">
<i class="button-icon icon-link-ext-alt"></i> <i class="button-icon icon-link-ext-alt"></i>
</a> </a>
<template v-if="!inConversation && !isPreview"> <template v-if="expandable && !isPreview">
<a href="#" @click.prevent="toggleExpanded" title="Expand"> <a href="#" @click.prevent="toggleExpanded" title="Expand">
<i class="button-icon icon-plus-squared"></i> <i class="button-icon icon-plus-squared"></i>
</a> </a>