From a629ec510f5e26f1c06c2e4b58cc58fa98dcbded Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Thu, 19 Sep 2019 16:22:28 +0200 Subject: [PATCH] Fix merge issue --- website/client/components/chat/chatCard.vue | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/website/client/components/chat/chatCard.vue b/website/client/components/chat/chatCard.vue index d20aee2aee..59926815c6 100644 --- a/website/client/components/chat/chatCard.vue +++ b/website/client/components/chat/chatCard.vue @@ -227,6 +227,9 @@ export default { }; } } + this.CHAT_FLAG_LIMIT_FOR_HIDING = CHAT_FLAG_LIMIT_FOR_HIDING; + this.CHAT_FLAG_FROM_SHADOW_MUTE = CHAT_FLAG_FROM_SHADOW_MUTE; + this.$emit('chat-card-mounted', this.msg.id); }, methods: { async like () { @@ -290,10 +293,5 @@ export default { return habiticaMarkdown.render(String(text)); }, }, - mounted () { - this.CHAT_FLAG_LIMIT_FOR_HIDING = CHAT_FLAG_LIMIT_FOR_HIDING; - this.CHAT_FLAG_FROM_SHADOW_MUTE = CHAT_FLAG_FROM_SHADOW_MUTE; - this.$emit('chat-card-mounted', this.msg.id); - }, };