Merge branch 'master' of git://github.com/JHenneberg/BookStack into JHenneberg-master

This commit is contained in:
Dan Brown 2020-03-06 19:49:16 +00:00
commit 4b2654598c
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
2 changed files with 6 additions and 2 deletions

View File

@ -5,15 +5,17 @@ import Clipboard from "clipboard/dist/clipboard.min";
import 'codemirror/mode/css/css';
import 'codemirror/mode/clike/clike';
import 'codemirror/mode/diff/diff';
import 'codemirror/mode/fortran/fortran';
import 'codemirror/mode/go/go';
import 'codemirror/mode/haskell/haskell';
import 'codemirror/mode/htmlmixed/htmlmixed';
import 'codemirror/mode/javascript/javascript';
import 'codemirror/mode/julia/julia';
import 'codemirror/mode/lua/lua';
import 'codemirror/mode/haskell/haskell';
import 'codemirror/mode/markdown/markdown';
import 'codemirror/mode/mllike/mllike';
import 'codemirror/mode/nginx/nginx';
import 'codemirror/mode/pascal/pascal';
import 'codemirror/mode/php/php';
import 'codemirror/mode/powershell/powershell';
import 'codemirror/mode/properties/properties';
@ -25,7 +27,6 @@ import 'codemirror/mode/sql/sql';
import 'codemirror/mode/toml/toml';
import 'codemirror/mode/xml/xml';
import 'codemirror/mode/yaml/yaml';
import 'codemirror/mode/pascal/pascal';
// Addons
import 'codemirror/addon/scroll/scrollpastend';
@ -43,6 +44,8 @@ const modeMap = {
'c#': 'text/x-csharp',
csharp: 'text/x-csharp',
diff: 'diff',
for: 'fortran',
fortran: 'fortran',
go: 'go',
haskell: 'haskell',
hs: 'haskell',

View File

@ -16,6 +16,7 @@
<a @click="updateLanguage('C')">C</a>
<a @click="updateLanguage('C++')">C++</a>
<a @click="updateLanguage('C#')">C#</a>
<a @click="updateLanguage('Fortran')">Fortran</a>
<a @click="updateLanguage('Go')">Go</a>
<a @click="updateLanguage('HTML')">HTML</a>
<a @click="updateLanguage('INI')">INI</a>