status-im
/
codimd
mirror of https://github.com/status-im/codimd.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update to support wiki markup syntax highlighting in view using prism

This commit is contained in:
Wu Cheng-Han 2016-09-18 16:42:27 +08:00
parent 42145e4019
commit 23008bc1e1
5 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bower.json
View File

@ -58,7 +58,8 @@
"visibilityjs": "^1.2.3", "visibilityjs": "^1.2.3",
"pdfobject": "pdfobject2#*", "pdfobject": "pdfobject2#*",
"gist-embed": "*", "gist-embed": "*",
"keymaster": "^1.6.3" "keymaster": "^1.6.3",
"prism": "^1.5.1"
}, },
"resolutions": { "resolutions": {
"jquery": "~3.1.0" "jquery": "~3.1.0"

14
public/js/extra.js
View File

@ -755,11 +755,17 @@ function highlightRender(code, lang) {
return '<div class="mermaid raw">' + code + '</div>'; return '<div class="mermaid raw">' + code + '</div>';
} }
var reallang = lang.replace(/\=$|\=\d+$|\=\+$/, ''); var reallang = lang.replace(/\=$|\=\d+$|\=\+$/, '');
var languages = hljs.listLanguages(); if (reallang == "tiddlywiki" || reallang == "mediawiki") {
if (languages.indexOf(reallang) == -1) { var result = {
var result = hljs.highlightAuto(code); value: Prism.highlight(code, Prism.languages.wiki)
};
} else { } else {
var result = hljs.highlight(reallang, code); var languages = hljs.listLanguages();
if (languages.indexOf(reallang) == -1) {
var result = hljs.highlightAuto(code);
} else {
var result = hljs.highlight(reallang, code);
}
} }
var showlinenumbers = /\=$|\=\d+$|\=\+$/.test(lang); var showlinenumbers = /\=$|\=\d+$|\=\+$/.test(lang);
if (showlinenumbers) { if (showlinenumbers) {

2
public/views/foot.ejs
View File

@ -50,6 +50,8 @@
<script src="<%- url %>/vendor/xss/dist/xss.min.js" defer></script> <script src="<%- url %>/vendor/xss/dist/xss.min.js" defer></script>
<script src="<%- url %>/vendor/string/dist/string.min.js" defer></script> <script src="<%- url %>/vendor/string/dist/string.min.js" defer></script>
<script src="<%- url %>/vendor/highlightjs/highlight.pack.min.js" defer></script> <script src="<%- url %>/vendor/highlightjs/highlight.pack.min.js" defer></script>
<script src="<%- url %>/vendor/prism/prism.js" defer></script>
<script src="<%- url %>/vendor/prism/components/prism-wiki.min.js" defer></script>
<script src="<%- url %>/vendor/js-cookie/src/js.cookie.js" defer></script> <script src="<%- url %>/vendor/js-cookie/src/js.cookie.js" defer></script>
<script src="<%- url %>/vendor/handlebars/handlebars.min.js" defer></script> <script src="<%- url %>/vendor/handlebars/handlebars.min.js" defer></script>
<script src="<%- url %>/vendor/emojify/js/emojify.min.js" defer></script> <script src="<%- url %>/vendor/emojify/js/emojify.min.js" defer></script>

1
public/views/head.ejs
View File

@ -34,6 +34,7 @@
<link rel="stylesheet" href="<%- url %>/vendor/codemirror/mode/mediawiki/mediawiki.css"> <link rel="stylesheet" href="<%- url %>/vendor/codemirror/mode/mediawiki/mediawiki.css">
<link rel="stylesheet" href="<%- url %>/css/github-extract.css"> <link rel="stylesheet" href="<%- url %>/css/github-extract.css">
<link rel="stylesheet" href="<%- url %>/vendor/highlightjs/styles/github-gist.css"> <link rel="stylesheet" href="<%- url %>/vendor/highlightjs/styles/github-gist.css">
<link rel="stylesheet" href="<%- url %>/vendor/prism/themes/prism.css">
<link rel="stylesheet" href="<%- url %>/vendor/emojify/css/emojify.min.css"> <link rel="stylesheet" href="<%- url %>/vendor/emojify/css/emojify.min.css">
<link rel="stylesheet" href="<%- url %>/vendor/showup/showup.css"> <link rel="stylesheet" href="<%- url %>/vendor/showup/showup.css">
<link rel="stylesheet" href="<%- url %>/css/mermaid.css"> <link rel="stylesheet" href="<%- url %>/css/mermaid.css">

3
public/views/pretty.ejs
View File

@ -31,6 +31,7 @@
<link rel="stylesheet" href='<%- url %>/css/github-extract.css'> <link rel="stylesheet" href='<%- url %>/css/github-extract.css'>
<link rel="stylesheet" href='<%- url %>/css/gist.css'> <link rel="stylesheet" href='<%- url %>/css/gist.css'>
<link rel="stylesheet" href='<%- url %>/vendor/highlightjs/styles/github-gist.css'> <link rel="stylesheet" href='<%- url %>/vendor/highlightjs/styles/github-gist.css'>
<link rel="stylesheet" href="<%- url %>/vendor/prism/themes/prism.css">
<link rel="stylesheet" href="<%- url %>/css/mermaid.css"> <link rel="stylesheet" href="<%- url %>/css/mermaid.css">
<link rel="stylesheet" href='<%- url %>/css/markdown.css'> <link rel="stylesheet" href='<%- url %>/css/markdown.css'>
<link rel="stylesheet" href='<%- url %>/vendor/emojify/css/emojify.min.css'> <link rel="stylesheet" href='<%- url %>/vendor/emojify/css/emojify.min.css'>
@ -115,6 +116,8 @@
<script src="<%- url %>/vendor/gist-embed/gist-embed.min.js" defer></script> <script src="<%- url %>/vendor/gist-embed/gist-embed.min.js" defer></script>
<script src="<%- url %>/vendor/string/dist/string.min.js" defer></script> <script src="<%- url %>/vendor/string/dist/string.min.js" defer></script>
<script src="<%- url %>/vendor/highlightjs/highlight.pack.min.js" defer></script> <script src="<%- url %>/vendor/highlightjs/highlight.pack.min.js" defer></script>
<script src="<%- url %>/vendor/prism/prism.js" defer></script>
<script src="<%- url %>/vendor/prism/components/prism-wiki.min.js" defer></script>
<script src="<%- url %>/vendor/js-cookie/src/js.cookie.js" defer></script> <script src="<%- url %>/vendor/js-cookie/src/js.cookie.js" defer></script>
<script src="<%- url %>/vendor/emojify/js/emojify.min.js" defer></script> <script src="<%- url %>/vendor/emojify/js/emojify.min.js" defer></script>
<script src="<%- url %>/vendor/raphael/raphael.min.js" defer></script> <script src="<%- url %>/vendor/raphael/raphael.min.js" defer></script>