diff options
| author | lambda <pleromagit@rogerbraun.net> | 2019-01-15 20:16:11 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2019-01-15 20:16:11 +0000 |
| commit | 502a76be0aa54edd23b4db58b3af90c57f0771cf (patch) | |
| tree | 4101ace12062e340d455e6b5676d96023d4240b5 | |
| parent | 85e2ca4a0a5e74a2b38c5f7ccea5288fbebb2cfe (diff) | |
| parent | 0fd7e7eb68d74dc89db26e869db562bddbec3790 (diff) | |
Merge branch 'summary-html' into 'develop'
Sync with backend: Use summary_html.
See merge request pleroma/pleroma-fe!463
| -rw-r--r-- | src/components/status/status.vue | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/components/status/status.vue b/src/components/status/status.vue index af756801..4a1aef8f 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -88,7 +88,7 @@ <div :class="{'tall-status': hideTallStatus}" class="status-content-wrapper"> <a class="tall-status-hider" :class="{ 'tall-status-hider_focused': isFocused }" v-if="hideTallStatus" href="#" @click.prevent="toggleShowMore">Show more</a> <div @click.prevent="linkClicked" class="status-content media-body" v-html="status.statusnet_html" v-if="!hideSubjectStatus"></div> - <div @click.prevent="linkClicked" class="status-content media-body" v-html="status.summary" v-else></div> + <div @click.prevent="linkClicked" class="status-content media-body" v-html="status.summary_html" v-else></div> <a v-if="hideSubjectStatus" href="#" class="cw-status-hider" @click.prevent="toggleShowMore">Show more</a> <a v-if="showingMore" href="#" class="status-unhider" @click.prevent="toggleShowMore">Show less</a> </div> |