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

bugfix: fix Marked highlihgt option

Browse Source
This commit is contained in:
Le Tan 2017-05-11 19:54:36 +08:00
parent a154e568de
commit df40ac2db0
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/resources/hoedown.js
View File

@ -1,9 +1,13 @@
var placeholder = document.getElementById('placeholder'); var placeholder = document.getElementById('placeholder');
// Use Marked to highlight code blocks. // Use Marked to highlight code blocks in edit mode.
marked.setOptions({ marked.setOptions({
highlight: function(code) { highlight: function(code, lang) {
return hljs.highlightAuto(code).value; if (lang && hljs.getLanguage(lang)) {
return hljs.highlight(lang, code).value;
} else {
return hljs.highlightAuto(code).value;
}
} }
}); });

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

@ -46,7 +46,6 @@ var mdit = window.markdownit({
} else { } else {
return hljs.highlightAuto(str).value; return hljs.highlightAuto(str).value;
} }
return '';
} }
}); });

8
src/resources/marked.js
View File

@ -16,8 +16,12 @@ renderer.heading = function(text, level) {
// Highlight.js to highlight code block // Highlight.js to highlight code block
marked.setOptions({ marked.setOptions({
highlight: function(code) { highlight: function(code, lang) {
return hljs.highlightAuto(code).value; if (lang && hljs.getLanguage(lang)) {
return hljs.highlight(lang, code).value;
} else {
return hljs.highlightAuto(code).value;
}
} }
}); });