diff options
Diffstat (limited to 'src/components/mentions_line')
| -rw-r--r-- | src/components/mentions_line/mentions_line.js | 4 | ||||
| -rw-r--r-- | src/components/mentions_line/mentions_line.vue | 75 |
2 files changed, 41 insertions, 38 deletions
diff --git a/src/components/mentions_line/mentions_line.js b/src/components/mentions_line/mentions_line.js index 2e84d4c5..6f347058 100644 --- a/src/components/mentions_line/mentions_line.js +++ b/src/components/mentions_line/mentions_line.js @@ -15,7 +15,7 @@ const MentionsLine = { }, computed: { oldStyle () { - return this.mergedConfig.mentionsOldStyle + return !this.mergedConfig.mentionsNewStyle }, limit () { return 6 @@ -39,7 +39,7 @@ const MentionsLine = { : '-newStyle' ] }, - ...mapGetters(['mergedConfig']), + ...mapGetters(['mergedConfig']) }, methods: { toggleShowMore () { diff --git a/src/components/mentions_line/mentions_line.vue b/src/components/mentions_line/mentions_line.vue index 6d114f2d..58f3de6f 100644 --- a/src/components/mentions_line/mentions_line.vue +++ b/src/components/mentions_line/mentions_line.vue @@ -1,42 +1,45 @@ <template> -<span class="MentionsLine"> - <MentionLink - v-for="mention in mentions" - class="mention-link" - :key="mention.statusnet_profile_url" - :content="mention.statusnet_profile_url" - :url="mention.statusnet_profile_url" - :first-mention="false" - /><span v-if="manyMentions" class="extraMentions"> - <span - v-if="expanded" - class="fullExtraMentions" + <span class="MentionsLine"> + <MentionLink + v-for="mention in mentions" + :key="mention.statusnet_profile_url" + class="mention-link" + :content="mention.statusnet_profile_url" + :url="mention.statusnet_profile_url" + :first-mention="false" + /><span + v-if="manyMentions" + class="extraMentions" > - <MentionLink - v-for="mention in extraMentions" - class="mention-link" - :key="mention.statusnet_profile_url" - :content="mention.statusnet_profile_url" - :url="mention.statusnet_profile_url" - :first-mention="false" - /> - </span><button - v-if="!expanded" - class="showMoreLess" - :class="buttonClasses" - @click="toggleShowMore" - > - {{ $t('status.plus_more', { number: extraMentions.length })}} - </button><button - v-if="expanded" - class="showMoreLess" - :class="buttonClasses" - @click="toggleShowMore" - > - {{ $t('general.show_less')}} - </button> + <span + v-if="expanded" + class="fullExtraMentions" + > + <MentionLink + v-for="mention in extraMentions" + :key="mention.statusnet_profile_url" + class="mention-link" + :content="mention.statusnet_profile_url" + :url="mention.statusnet_profile_url" + :first-mention="false" + /> + </span><button + v-if="!expanded" + class="showMoreLess" + :class="buttonClasses" + @click="toggleShowMore" + > + {{ $t('status.plus_more', { number: extraMentions.length }) }} + </button><button + v-if="expanded" + class="showMoreLess" + :class="buttonClasses" + @click="toggleShowMore" + > + {{ $t('general.show_less') }} + </button> + </span> </span> -</span> </template> <script src="./mentions_line.js" ></script> <style lang="scss" src="./mentions_line.scss" /> |