From bdc868246f4678d4b4c2883ef0dc2959c36128c5 Mon Sep 17 00:00:00 2001 From: Alan Guo Xiang Tan Date: Thu, 6 Jan 2022 15:28:32 +0800 Subject: [PATCH] DEV: Removing unused lines of code. The code had no effect on how the markdown-it is being configured. --- .../pretty-text/addon/engines/discourse-markdown-it.js | 2 +- .../javascripts/pretty-text/addon/pretty-text.js | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown-it.js b/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown-it.js index addf44351c3..80e5f3338a9 100644 --- a/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown-it.js +++ b/app/assets/javascripts/pretty-text/addon/engines/discourse-markdown-it.js @@ -374,7 +374,7 @@ export function setup(opts, siteSettings, state) { opts.engine = window.markdownit({ discourse: opts.discourse, html: true, - breaks: opts.discourse.features.newline, + breaks: !siteSettings.traditional_markdown_linebreaks, xhtmlOut: false, linkify: siteSettings.enable_markdown_linkify, typographer: siteSettings.enable_markdown_typographer, diff --git a/app/assets/javascripts/pretty-text/addon/pretty-text.js b/app/assets/javascripts/pretty-text/addon/pretty-text.js index 89c9211a371..12edf332954 100644 --- a/app/assets/javascripts/pretty-text/addon/pretty-text.js +++ b/app/assets/javascripts/pretty-text/addon/pretty-text.js @@ -33,7 +33,6 @@ export function buildOptions(state) { emojiUnicodeReplacer, lookupUploadUrls, previewing, - linkify, censoredRegexp, disableEmojis, customEmojiTranslation, @@ -41,14 +40,7 @@ export function buildOptions(state) { watchedWordsLink, } = state; - // These are markdown-it rules defined in https://github.com/markdown-it/markdown-it#manage-rules. - let features = { - "bold-italics": true, - "auto-link": true, - html: true, - linkify: linkify !== false, - newline: !siteSettings.traditional_markdown_linebreaks, - }; + let features = {}; if (state.features) { features = deepMerge(features, state.features);