|
@@ -125,15 +125,20 @@ Crowi.rendererType.markdown.prototype = {
|
|
|
marked.setOptions({
|
|
marked.setOptions({
|
|
|
gfm: true,
|
|
gfm: true,
|
|
|
highlight: function (code, lang, callback) {
|
|
highlight: function (code, lang, callback) {
|
|
|
- var result;
|
|
|
|
|
|
|
+ var result, hl;
|
|
|
if (lang) {
|
|
if (lang) {
|
|
|
- result = hljs.highlight(lang, code);
|
|
|
|
|
- return callback(null, result.value);
|
|
|
|
|
|
|
+ try {
|
|
|
|
|
+ hl = hljs.highlight(lang, code);
|
|
|
|
|
+ result = hl.value;
|
|
|
|
|
+ } catch (e) {
|
|
|
|
|
+ result = code;
|
|
|
|
|
+ }
|
|
|
} else {
|
|
} else {
|
|
|
//result = hljs.highlightAuto(code);
|
|
//result = hljs.highlightAuto(code);
|
|
|
//callback(null, result.value);
|
|
//callback(null, result.value);
|
|
|
- return callback(null, code);
|
|
|
|
|
|
|
+ result = code;
|
|
|
}
|
|
}
|
|
|
|
|
+ return callback(null, result);
|
|
|
},
|
|
},
|
|
|
tables: true,
|
|
tables: true,
|
|
|
breaks: true,
|
|
breaks: true,
|