public/Boostnote
1
0
Fork 0
mirror of https://github.com/BoostIo/Boostnote synced 2025-12-13 17:56:25 +00:00
Code Issues Releases Wiki Activity

refactor: fix to use cut off file

Browse Source
This commit is contained in:
asmsuechan
2017-11-07 14:44:15 +09:00
parent 2ce96186f2
commit 6047987c25
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
browser/lib/markdown.js
View File

@@ -3,6 +3,7 @@ import emoji from 'markdown-it-emoji'
import math from '@rokt33r/markdown-it-math' import math from '@rokt33r/markdown-it-math'
import _ from 'lodash' import _ from 'lodash'
// FIXME We should not depend on global variable.
const katex = window.katex const katex = window.katex
function createGutter (str) { function createGutter (str) {
@@ -137,6 +138,7 @@ md.renderer.render = function render (tokens, options, env) {
let result = originalRender.call(md.renderer, tokens, options, env) let result = originalRender.call(md.renderer, tokens, options, env)
return result return result
} }
// FIXME We should not depend on global variable.
window.md = md window.md = md
function strip (input) { function strip (input) {
@@ -177,7 +179,11 @@ const markdown = {
const renderedContent = md.render(content) const renderedContent = md.render(content)
return renderedContent return renderedContent
}, },
<<<<<<< HEAD
strip, strip,
normalizeLinkText normalizeLinkText
=======
>>>>>>> refactor: fix to use cut off file
} }
export default markdown export default markdown

2
browser/main/Detail/MarkdownNoteDetail.js
View File

@@ -9,7 +9,7 @@ import FolderSelect from './FolderSelect'
import dataApi from 'browser/main/lib/dataApi' import dataApi from 'browser/main/lib/dataApi'
import { hashHistory } from 'react-router' import { hashHistory } from 'react-router'
import ee from 'browser/main/lib/eventEmitter' import ee from 'browser/main/lib/eventEmitter'
import markdown from 'browser/lib/markdown' import markdown from 'browser/lib/markdownTextHelper'
import StatusBar from '../StatusBar' import StatusBar from '../StatusBar'
import _ from 'lodash' import _ from 'lodash'
import { findNoteTitle } from 'browser/lib/findNoteTitle' import { findNoteTitle } from 'browser/lib/findNoteTitle'