From ad621e7208e4e9bfc169ea5a14fa81b8d6a03dc6 Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Wed, 23 Aug 2017 14:36:43 -0500 Subject: [PATCH] Redesign: Misc fixes (#8984) * fix(checklists): parse Markdown * fix(Guilds): Markdown in descriptions --- website/client/components/groups/group.vue | 4 +++- website/client/components/tasks/task.vue | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/website/client/components/groups/group.vue b/website/client/components/groups/group.vue index 7f1a8b394b..c6cb9dfc7d 100644 --- a/website/client/components/groups/group.vue +++ b/website/client/components/groups/group.vue @@ -125,7 +125,7 @@ .toggle-down(@click="sections.description = !sections.description", v-if="!sections.description") .svg-icon(v-html="icons.downIcon") .section(v-if="sections.description") - p {{ group.description }} + p(v-markdown='group.description') .section-header.challenge .row @@ -380,6 +380,7 @@ import inviteModal from './inviteModal'; import chatMessage from '../chat/chatMessages'; import autocomplete from '../chat/autoComplete'; import groupChallenges from '../challenges/groupChallenges'; +import markdownDirective from 'client/directives/markdown'; import bCollapse from 'bootstrap-vue/lib/components/collapse'; import bCard from 'bootstrap-vue/lib/components/card'; @@ -418,6 +419,7 @@ export default { }, directives: { bToggle, + markdown: markdownDirective, }, data () { return { diff --git a/website/client/components/tasks/task.vue b/website/client/components/tasks/task.vue index 6479929836..0017974a71 100644 --- a/website/client/components/tasks/task.vue +++ b/website/client/components/tasks/task.vue @@ -21,7 +21,7 @@ ) input.custom-control-input(type="checkbox", :checked="item.completed", @change="toggleChecklistItem(item)") span.custom-control-indicator - span.custom-control-description {{ item.text }} + span.custom-control-description(v-markdown='item.text') .icons.small-text.d-flex.align-items-center .d-flex.align-items-center(v-if="task.type === 'todo' && task.date", :class="{'due-overdue': isDueOverdue}") .svg-icon.calendar(v-html="icons.calendar")