From b7748d849b70562664bb6d8699496700d77d3f49 Mon Sep 17 00:00:00 2001 From: Nolan Lawson Date: Thu, 14 Jun 2018 12:52:00 -0700 Subject: [PATCH] add mentions outside of content warnings (#393) Fixes #389 --- routes/_components/status/Status.html | 9 +++++- routes/_components/status/StatusMentions.html | 30 +++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 routes/_components/status/StatusMentions.html diff --git a/routes/_components/status/Status.html b/routes/_components/status/Status.html index 7214103d..4f0eb903 100644 --- a/routes/_components/status/Status.html +++ b/routes/_components/status/Status.html @@ -18,6 +18,9 @@ {#if spoilerText} {/if} + {#if !showContent} + + {/if} {#if showContent || contentPreloaded} {/if} @@ -44,6 +47,7 @@ "sidebar author-name author-handle relative-date" "sidebar spoiler spoiler spoiler" "sidebar spoiler-btn spoiler-btn spoiler-btn" + "sidebar mentions mentions mentions" "sidebar content content content" "media media media media" "....... toolbar toolbar toolbar" @@ -67,6 +71,7 @@ "sidebar author-handle" "spoiler spoiler" "spoiler-btn spoiler-btn" + "mentions mentions" "content content" "media media" "details details" @@ -98,6 +103,7 @@ import StatusContent from './StatusContent.html' import StatusSpoiler from './StatusSpoiler.html' import StatusComposeBox from './StatusComposeBox.html' + import StatusMentions from './StatusMentions.html' import { store } from '../../_store/store' import { goto } from 'sapper/runtime.js' import { registerClickDelegate } from '../../_utils/delegate' @@ -136,7 +142,8 @@ StatusMediaAttachments, StatusContent, StatusSpoiler, - StatusComposeBox + StatusComposeBox, + StatusMentions }, data: () => ({ notification: void 0, diff --git a/routes/_components/status/StatusMentions.html b/routes/_components/status/StatusMentions.html new file mode 100644 index 00000000..cfc510bf --- /dev/null +++ b/routes/_components/status/StatusMentions.html @@ -0,0 +1,30 @@ +{#if mentions.length} +
+

+ {#each mentions as mention, i} + {#if i > 0} +   + {/if} + + @{mention.acct} + + {/each} +

+
+{/if} + + \ No newline at end of file