diff options
| author | Shpuld Shpuldson <shpuld@gmail.com> | 2017-03-10 07:12:04 -0500 |
|---|---|---|
| committer | Shpuld Shpuldson <shpuld@gmail.com> | 2017-03-10 07:12:04 -0500 |
| commit | 33f72ab2c215ebd7709edaf7a63062aabe8363cc (patch) | |
| tree | a2cec29e4afab22aeec5e7ed41b25a19263402d3 /src/components/status/status.js | |
| parent | bfbbb527677ba4648b1be376bb02b0bd3c3e29ba (diff) | |
| parent | 896de016adbabd142c09476a323f4e02cefa88c9 (diff) | |
Merge branch 'wakarimasen/pleroma-fe-develop' into 'develop'
Wakarimasen/pleroma fe develop
See merge request !55
Diffstat (limited to 'src/components/status/status.js')
| -rw-r--r-- | src/components/status/status.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/components/status/status.js b/src/components/status/status.js index 6faebf61..87fff879 100644 --- a/src/components/status/status.js +++ b/src/components/status/status.js @@ -9,6 +9,7 @@ const Status = { props: [ 'statusoid', 'expandable', + 'inConversation', 'focused' ], data: () => ({ @@ -18,7 +19,10 @@ const Status = { userExpanded: false }), computed: { - hideAttachments () { return this.$store.state.config.hideAttachments }, + hideAttachments () { + return (this.$store.state.config.hideAttachments && !this.inConversation) || + (this.$store.state.config.hideAttachmentsInConv && this.inConversation) + }, retweet () { return !!this.statusoid.retweeted_status }, retweeter () { return this.statusoid.user.name }, status () { |