From de9644f1268c8d96ac9ae6ca2124a0f65a022099 Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Fri, 16 Sep 2016 08:52:27 -0500 Subject: [PATCH] chore: switch out markdown-it for habitica-markdown --- package.json | 2 +- website/server/controllers/top-level/pages.js | 6 +----- website/views/static/faq.jade | 4 ++-- website/views/static/overview.jade | 4 ++-- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 6865aee3d8..0da31ec12a 100644 --- a/package.json +++ b/package.json @@ -53,13 +53,13 @@ "gulp-uglify": "^1.4.2", "gulp.spritesmith": "^4.1.0", "icalendar": "lefnire/node-icalendar#e06da0e55901f0ba940dfadc42c158ed0b1fead9", + "habitica-markdown": "^1.3.0", "image-size": "~0.3.2", "in-app-purchase": "^1.1.6", "jade": "~1.11.0", "js2xmlparser": "~1.0.0", "lodash": "^3.10.1", "lodash.setwith": "^4.2.0", - "markdown-it": "^6.0.1", "merge-stream": "^1.0.0", "method-override": "^2.3.5", "moment": "^2.13.0", diff --git a/website/server/controllers/top-level/pages.js b/website/server/controllers/top-level/pages.js index 8c1f9aff2e..09b44d8419 100644 --- a/website/server/controllers/top-level/pages.js +++ b/website/server/controllers/top-level/pages.js @@ -1,10 +1,6 @@ import locals from '../../middlewares/locals'; import _ from 'lodash'; -import markdownIt from 'markdown-it'; - -const md = markdownIt({ - html: true, -}); +import md from 'habitica-markdown'; let api = {}; diff --git a/website/views/static/faq.jade b/website/views/static/faq.jade index c14efc2250..9a7873967a 100644 --- a/website/views/static/faq.jade +++ b/website/views/static/faq.jade @@ -22,8 +22,8 @@ block content - for heading, index in headings a.h2.accordion.collapsed(ng-href='#' + heading, data-toggle='collapse')=env.t('faqQuestion' + index) .clearfix.collapse(id=heading) - !=md.render(env.t('webFaqAnswer' + index)) + !=md.unsafeHTMLRender(env.t('webFaqAnswer' + index)) hr - h3!=md.render(env.t('webFaqStillNeedHelp')) + h3!=md.unsafeHTMLRender(env.t('webFaqStillNeedHelp')) diff --git a/website/views/static/overview.jade b/website/views/static/overview.jade index b22c377bf3..21417ea861 100644 --- a/website/views/static/overview.jade +++ b/website/views/static/overview.jade @@ -18,6 +18,6 @@ block content - for step in stepsNum h3=env.t('step'+step) p - !=md.render(env.t('webStep'+step+'Text')) + !=md.unsafeHTMLRender(env.t('webStep'+step+'Text')) hr - !=md.render(env.t('overviewQuestions')) + !=md.unsafeHTMLRender(env.t('overviewQuestions'))