krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-13 04:37:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge issue

Browse Source
This commit is contained in:
Phillip Thelen
2019-09-19 16:22:28 +02:00
parent 6523b6b342
commit a629ec510f
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
website/client/components/chat/chatCard.vue
View File

@@ -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: { methods: {
async like () { async like () {
@@ -290,10 +293,5 @@ export default {
return habiticaMarkdown.render(String(text)); 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);
},
}; };
</script> </script>