From 2f383c2c0197b94b30fdc4c5e0c742c7e104be20 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Tue, 8 Jun 2021 14:34:47 +0300 Subject: moved mentions into a separate component - MentionLine, added collapsing of mentions when there's too many of 'em --- src/components/status_body/status_body.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'src/components/status_body/status_body.js') diff --git a/src/components/status_body/status_body.js b/src/components/status_body/status_body.js index 232afccb..0c1aa88e 100644 --- a/src/components/status_body/status_body.js +++ b/src/components/status_body/status_body.js @@ -1,5 +1,6 @@ import fileType from 'src/services/file_type/file_type.service' import RichContent from 'src/components/rich_content/rich_content.jsx' +import MentionsLine from 'src/components/mentions_line/mentions_line.vue' import { processHtml } from 'src/services/tiny_post_html_processor/tiny_post_html_processor.service.js' import { extractTagFromUrl } from 'src/services/matcher/matcher.service.js' import { mapGetters } from 'vuex' @@ -104,10 +105,17 @@ const StatusContent = { attachmentTypes () { return this.status.attachments.map(file => fileType.fileType(file.mimetype)) }, + mentionsOldPlace () { + return this.mergedConfig.mentionsOldPlace + }, + mentions () { + return this.status.attentions + }, ...mapGetters(['mergedConfig']) }, components: { - RichContent + RichContent, + MentionsLine }, mounted () { this.status.attentions && this.status.attentions.forEach(attn => { -- cgit v1.2.3-70-g09d2