aboutsummaryrefslogtreecommitdiff
path: root/src/components/status/status.vue
diff options
context:
space:
mode:
authorMaksim Pechnikov <parallel588@gmail.com>2020-02-13 09:32:45 +0300
committerMaksim Pechnikov <parallel588@gmail.com>2020-02-13 09:32:45 +0300
commite3d0b2f137ccb355c16788e9b890df609cee1698 (patch)
tree1553a825f06731b32433206e24af7a0fa96b757a /src/components/status/status.vue
parenta52ae1ebeb0e69c4484122be8fca7e68b030db32 (diff)
parent96dc297babd5797b9307af8676719c2eb8cd80e2 (diff)
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into develop
Diffstat (limited to 'src/components/status/status.vue')
-rw-r--r--src/components/status/status.vue1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 0a82dcbe..83f07dac 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -369,6 +369,7 @@
</transition>
<EmojiReactions
+ v-if="(mergedConfig.emojiReactionsOnTimeline || isFocused) && (!noHeading && !isPreview)"
:status="status"
/>