From 01281b6414c9c469b12d38681fe249fc502f41ad Mon Sep 17 00:00:00 2001 From: Matteo Pagliazzi Date: Sun, 31 Mar 2019 19:38:34 +0200 Subject: [PATCH] fix(markdown): make sure to only render strings, fix #11080 --- website/client/components/chat/chatCard.vue | 3 ++- website/client/directives/markdown.js | 4 +++- website/client/mixins/notifications.js | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/website/client/components/chat/chatCard.vue b/website/client/components/chat/chatCard.vue index a9ccae3fb9..fac207d5c0 100644 --- a/website/client/components/chat/chatCard.vue +++ b/website/client/components/chat/chatCard.vue @@ -269,7 +269,8 @@ export default { return highlightUsers(text, this.user.auth.local.username, this.user.profile.name); }, parseMarkdown (text) { - return habiticaMarkdown.render(text); + if (!text) return; + return habiticaMarkdown.render(String(text)); }, }, }; diff --git a/website/client/directives/markdown.js b/website/client/directives/markdown.js index 1b50190271..98c174f431 100644 --- a/website/client/directives/markdown.js +++ b/website/client/directives/markdown.js @@ -3,6 +3,8 @@ import habiticaMarkdown from 'habitica-markdown'; export default function markdown (el, {value, oldValue}) { if (value === oldValue) return; - el.innerHTML = habiticaMarkdown.render(value); + if (value) { + el.innerHTML = habiticaMarkdown.render(String(value)); + } el.classList.add('markdown'); } \ No newline at end of file diff --git a/website/client/mixins/notifications.js b/website/client/mixins/notifications.js index 6e15c2c39f..26a121dfdc 100644 --- a/website/client/mixins/notifications.js +++ b/website/client/mixins/notifications.js @@ -46,7 +46,7 @@ export default { }, markdown (val) { if (!val) return; - let parsedMarkdown = habiticaMarkdown.render(val); + let parsedMarkdown = habiticaMarkdown.render(String(val)); this.notify(parsedMarkdown, 'info'); }, mp (val) {