diff options
| author | jared <jaredrmain@gmail.com> | 2019-04-01 12:54:34 -0400 |
|---|---|---|
| committer | jared <jaredrmain@gmail.com> | 2019-04-01 12:54:34 -0400 |
| commit | 748b1ed1673033b2564ea9833d74f8c88c9c343b (patch) | |
| tree | dece1ad8cddde45206da92ca88ec50b4c6e56534 | |
| parent | 6c24ae9b0be25becc453cd62ba78b955c5fb6c70 (diff) | |
#470 - fix subject and content toggle issue
| -rw-r--r-- | src/components/status/status.js | 3 | ||||
| -rw-r--r-- | src/components/status/status.vue | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/components/status/status.js b/src/components/status/status.js index 550fe76f..cb2693e1 100644 --- a/src/components/status/status.js +++ b/src/components/status/status.js @@ -251,6 +251,9 @@ const Status = { }, maxThumbnails () { return this.$store.state.config.maxThumbnails + }, + contentHtml () { + return this.status.summary_html + '<br />' + this.status.statusnet_html } }, components: { diff --git a/src/components/status/status.vue b/src/components/status/status.vue index 1f415534..b66c1c93 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -99,12 +99,12 @@ <div class="status-content-wrapper" :class="{ 'tall-status': !showingLongSubject }" v-if="longSubject"> <a class="tall-status-hider" :class="{ 'tall-status-hider_focused': isFocused }" v-if="!showingLongSubject" href="#" @click.prevent="showingLongSubject=true">Show more</a> - <div @click.prevent="linkClicked" class="status-content media-body" v-html="status.statusnet_html"></div> + <div @click.prevent="linkClicked" class="status-content media-body" v-html="contentHtml"></div> <a v-if="showingLongSubject" href="#" class="status-unhider" @click.prevent="showingLongSubject=false">Show less</a> </div> <div :class="{'tall-status': hideTallStatus}" class="status-content-wrapper" v-else> <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="contentHtml" v-if="!hideSubjectStatus"></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> |