diff options
| author | shpuld <shp@cock.li> | 2019-01-20 15:52:35 +0200 |
|---|---|---|
| committer | shpuld <shp@cock.li> | 2019-01-20 15:52:35 +0200 |
| commit | 8761e039d04ff26944c87339ef55d2951a42696c (patch) | |
| tree | 69a1d49f724d99fb49c72bd7d2f6bb1a73e8f066 /src/components/status/status.vue | |
| parent | 485a061287149fe0ff5c4a188d21d775ff271f6d (diff) | |
| parent | 7651290e2be72ed35d7582757251eb151fdce953 (diff) | |
Merge dev fix conflicts
Diffstat (limited to 'src/components/status/status.vue')
| -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 f88b5afb..d7cab15b 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> |