github/marktext
5
0
Fork 0
mirror of https://github.com/marktext/marktext.git synced 2025-05-03 21:21:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Feature: validate block html

Browse Source
This commit is contained in:
Jocs 2018-04-08 02:47:25 +08:00
parent 1e1f7f7cd8
commit b16c23b5ee
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/editor/contentState/codeBlockCtrl.js
View File

@ -1,12 +1,26 @@
import beautify from 'js-beautify'
import codeMirror, { setMode, setCursorAtLastLine } from '../codeMirror'
import { createInputInCodeBlock } from '../utils/domManipulate'
import { escapeInBlockHtml } from '../utils'
import { codeMirrorConfig, CLASS_OR_ID, htmlBeautifyConfig } from '../config'
import { codeMirrorConfig, CLASS_OR_ID, BLOCK_TYPE7 } from '../config'
const beautifyHtml = beautify.html
const CODE_UPDATE_REP = /^`{3,}(.*)/
const beautifyHtml = html => {
const HTML_REG = /^<([a-zA-Z\d-]+)(?=\s|>).*?>/
const HTML_NEWLINE_REG = /^<([a-zA-Z\d-]+)(?=\s|>).*?>\n/
const match = HTML_REG.exec(html)
const tag = match ? match[1] : null
// no empty line in block html
let result = html // .split(/\n/).filter(line => /\S/.test(line)).join('\n')
// start inline tag must ends with `\n`
if (tag) {
if (BLOCK_TYPE7.indexOf(tag) > -1 && !HTML_NEWLINE_REG.test(html)) {
result = result.replace(HTML_REG, (m, p) => `${m}\n`)
}
}
return result
}
const codeBlockCtrl = ContentState => {
ContentState.prototype.selectLanguage = function (paragraph, name) {
const block = this.getBlock(paragraph.id)
@ -109,8 +123,9 @@ const codeBlockCtrl = ContentState => {
codeBlock.on('blur', (cm, event) => {
block.pos = cm.getCursor()
if (block.functionType === 'html') {
// todo @jocs beautifyHtml is not work ???
block.text = beautifyHtml(cm.getValue(), htmlBeautifyConfig)
const value = cm.getValue()
block.text = beautifyHtml(value)
}
})
@ -124,7 +139,6 @@ const codeBlockCtrl = ContentState => {
const value = cm.getValue()
block.text = value
block.history = cm.getHistory()
// todo handle preview in HTML block
if (block.functionType === 'html') {
const preBlock = this.getNextSibling(block)
const htmlBlock = this.getParent(this.getParent(block))

2
src/editor/contentState/htmlBlock.js
View File

@ -1,4 +1,4 @@
import { VOID_HTML_TAGS, /* BLOCK_TYPE1, BLOCK_TYPE2_REG, BLOCK_TYPE6, BLOCK_TYPE7, */HTML_TAGS, HTML_TOOLS } from '../config'
import { VOID_HTML_TAGS, HTML_TAGS, HTML_TOOLS } from '../config'
const HTML_BLOCK_REG = /^<([a-zA-Z\d-]+)(?=\s|>).*>$/