diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-04-01 18:45:24 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-04-01 18:45:24 +0000 |
| commit | c17de4b638f6a2a575e5b44bccca9c39fe4db30e (patch) | |
| tree | 895408dd06b5fd52edd5d2b6dcee1ad8de4ff7d8 /src/components/status/status.js | |
| parent | 6c24ae9b0be25becc453cd62ba78b955c5fb6c70 (diff) | |
| parent | dee9ab7bda8edd28868d55d6738665022a53c1a0 (diff) | |
Merge branch '470-toggle-subject-content' into 'develop'
Resolve "Handling subjects/spoiler_text/cw not working properly"
Closes #470
See merge request pleroma/pleroma-fe!721
Diffstat (limited to 'src/components/status/status.js')
| -rw-r--r-- | src/components/status/status.js | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/components/status/status.js b/src/components/status/status.js index 550fe76f..0295cd04 100644 --- a/src/components/status/status.js +++ b/src/components/status/status.js @@ -251,6 +251,12 @@ const Status = { }, maxThumbnails () { return this.$store.state.config.maxThumbnails + }, + contentHtml () { + if (!this.status.summary_html) { + return this.status.statusnet_html + } + return this.status.summary_html + '<br />' + this.status.statusnet_html } }, components: { |