lsm/mindoc
1
0
Fork 0
mirror of https://github.com/mindoc-org/mindoc.git synced 2025-10-25 19:17:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat:1、修复无数据时报错的问题。

Browse Source 
2、新增自定义代码着色格式
3、新增自动加载配置文件
This commit is contained in:
lifei6671
2018-08-07 17:19:56 +08:00
parent c0c3db6c50
commit 327d6fb8d8
280 changed files with 162 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
static/editor.md/editormd.amd.js
View File

@@ -26,7 +26,9 @@
var cmAddonPath = "codemirror/addon/";
var codeMirrorModules = [
"jquery", "marked", "prettify",
"jquery", "marked",
//"prettify",
"highlight/highlight",
"katex", "raphael", "underscore", "flowchart", "jqueryflowchart", "sequenceDiagram",
"codemirror/lib/codemirror",
@@ -239,6 +241,7 @@
flowChart : false, // flowChart.js only support IE9+
sequenceDiagram : false, // sequenceDiagram.js only support IE9+
previewCodeHighlight : true,
highlightStyle : "github",
toolbar : true, // show/hide toolbar
toolbarAutoFixed : true, // on window scroll auto fixed position
@@ -653,7 +656,10 @@
if (settings.previewCodeHighlight)
{
editormd.loadScript(loadPath + "prettify.min", function() {
// editormd.loadScript(loadPath + "prettify.min", function() {
// loadFlowChartOrSequenceDiagram();
// });
editormd.loadScript(loadPath + "highlight/highlight", function() {
loadFlowChartOrSequenceDiagram();
});
}
@@ -1543,11 +1549,16 @@
if (settings.previewCodeHighlight)
{
previewContainer.find("pre").addClass("prettyprint linenums");
if (typeof prettyPrint !== "undefined")
{
prettyPrint();
// previewContainer.find("pre").addClass("prettyprint");
//
// if (typeof prettyPrint !== "undefined")
// {
// prettyPrint();
// }
if (typeof hljs !== "undefined") {
previewContainer.find('pre').each(function (i, block) {
hljs.highlightBlock(block);
});
}
}
@@ -4064,8 +4075,11 @@
if (settings.previewCodeHighlight)
{
div.find("pre").addClass("prettyprint linenums");
prettyPrint();
//div.find("pre").addClass("prettyprint");
//prettyPrint();
div.find("pre").each(function (i, block) {
hljs.highlightBlock(block);
});
}
if (!editormd.isIE8)