dawy_go/vnote
1
0
Fork 0
mirror of https://gitee.com/vnotex/vnote.git synced 2025-07-05 13:59:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

flowchart: support both flow and flowchart as the language

Browse Source
This commit is contained in:
Le Tan 2018-03-16 21:38:45 +08:00
parent dfbb692b15
commit de7ea32104
5 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/resources/hoedown.js
View File

@ -32,7 +32,9 @@ var updateHtml = function(html) {
--i;
continue;
}
} else if (VEnableFlowchart && code.classList.contains('language-flowchart')) {
} else if (VEnableFlowchart
&& (code.classList.contains('language-flowchart')
|| code.classList.contains('language-flow'))) {
// Flowchart code block.
if (renderFlowchartOne(code)) {
// replaceChild() will decrease codes.length.

7
src/resources/markdown-it.js
View File

@ -44,10 +44,7 @@ var mdit = window.markdownit({
typographer: true,
langPrefix: 'lang-',
highlight: function(str, lang) {
if (lang
&& (!VEnableMathjax || lang != 'mathjax')
&& (!VEnableMermaid || lang != 'mermaid')
&& (!VEnableFlowchart || lang != 'flowchart')) {
if (lang && !specialCodeBlock(lang)) {
if (hljs.getLanguage(lang)) {
return hljs.highlight(lang, str, true).value;
} else {
@ -110,7 +107,7 @@ var updateText = function(text) {
handleToc(needToc);
insertImageCaption();
renderMermaid('lang-mermaid');
renderFlowchart('lang-flowchart');
renderFlowchart(['lang-flowchart', 'lang-flow']);
addClassToCodeBlock();
renderCodeBlockLineNumber();

19
src/resources/markdown_template.js
View File

@ -543,7 +543,7 @@ var renderMermaidOne = function(code) {
var flowchartIdx = 0;
// @className, the class name of the flowchart code block, such as 'lang-flowchart'.
var renderFlowchart = function(className) {
var renderFlowchart = function(classNames) {
if (!VEnableFlowchart) {
return;
}
@ -552,7 +552,15 @@ var renderFlowchart = function(className) {
flowchartIdx = 0;
for (var i = 0; i < codes.length; ++i) {
var code = codes[i];
if (code.classList.contains(className)) {
var matched = false;
for (var j = 0; j < classNames.length; ++j) {
if (code.classList.contains(classNames[j])) {
matched = true;
break;
}
}
if (matched) {
if (renderFlowchartOne(code, flowchartIdx)) {
// replaceChild() will decrease codes.length.
--i;
@ -1157,3 +1165,10 @@ var calculateWordCount = function() {
content.updateWordCountInfo(wc, cns, cc);
};
// Whether it is a special code block, such as MathJax, Mermaid, or Flowchart.
var specialCodeBlock = function(lang) {
return (VEnableMathjax && lang == 'mathjax')
|| (VEnableMermaid && lang == 'mermaid')
|| (VEnableFlowchart && (lang == 'flowchart' || lang == 'flow'));
};

7
src/resources/marked.js
View File

@ -17,10 +17,7 @@ renderer.heading = function(text, level) {
// Highlight.js to highlight code block
marked.setOptions({
highlight: function(code, lang) {
if (lang
&& (!VEnableMathjax || lang != 'mathjax')
&& (!VEnableMermaid || lang != 'mermaid')
&& (!VEnableFlowchart || lang != 'flowchart')) {
if (lang && !specialCodeBlock(lang)) {
if (hljs.getLanguage(lang)) {
return hljs.highlight(lang, code, true).value;
} else {
@ -59,7 +56,7 @@ var updateText = function(text) {
handleToc(needToc);
insertImageCaption();
renderMermaid('lang-mermaid');
renderFlowchart('lang-flowchart');
renderFlowchart(['lang-flowchart', 'lang-flow']);
addClassToCodeBlock();
renderCodeBlockLineNumber();

6
src/resources/showdown.js
View File

@ -57,7 +57,9 @@ var highlightCodeBlocks = function(doc, enableMermaid, enableFlowchart, enableMa
if (enableMermaid && code.classList.contains('language-mermaid')) {
// Mermaid code block.
continue;
} else if (enableFlowchart && code.classList.contains('language-flowchart')) {
} else if (enableFlowchart
&& (code.classList.contains('language-flowchart')
|| code.classList.contains('language-flow'))) {
// Flowchart code block.
continue;
} else if (enableMathJax && code.classList.contains('language-mathjax')) {
@ -84,7 +86,7 @@ var updateText = function(text) {
insertImageCaption();
highlightCodeBlocks(document, VEnableMermaid, VEnableFlowchart, VEnableMathjax);
renderMermaid('language-mermaid');
renderFlowchart('language-flowchart');
renderFlowchart(['language-flowchart', 'language-flow']);
addClassToCodeBlock();
renderCodeBlockLineNumber();