diff --git a/browser/lib/markdown.js b/browser/lib/markdown.js index 04061d03..0b2b1171 100644 --- a/browser/lib/markdown.js +++ b/browser/lib/markdown.js @@ -3,6 +3,7 @@ import emoji from 'markdown-it-emoji' import math from '@rokt33r/markdown-it-math' import _ from 'lodash' +// FIXME We should not depend on global variable. const katex = window.katex function createGutter (str) { @@ -137,6 +138,7 @@ md.renderer.render = function render (tokens, options, env) { let result = originalRender.call(md.renderer, tokens, options, env) return result } +// FIXME We should not depend on global variable. window.md = md function strip (input) { @@ -177,7 +179,11 @@ const markdown = { const renderedContent = md.render(content) return renderedContent }, +<<<<<<< HEAD strip, normalizeLinkText +======= +>>>>>>> refactor: fix to use cut off file } + export default markdown diff --git a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/MarkdownNoteDetail.js index 767f17b3..bc407b62 100644 --- a/browser/main/Detail/MarkdownNoteDetail.js +++ b/browser/main/Detail/MarkdownNoteDetail.js @@ -9,7 +9,7 @@ import FolderSelect from './FolderSelect' import dataApi from 'browser/main/lib/dataApi' import { hashHistory } from 'react-router' import ee from 'browser/main/lib/eventEmitter' -import markdown from 'browser/lib/markdown' +import markdown from 'browser/lib/markdownTextHelper' import StatusBar from '../StatusBar' import _ from 'lodash' import { findNoteTitle } from 'browser/lib/findNoteTitle'