X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/968e7b8b72dba148166253c00e6b0d09b714888f..refs/pull/448/head:/resources/assets/js/code.js diff --git a/resources/assets/js/code.js b/resources/assets/js/code.js index ef6bca2e2..014c4eb77 100644 --- a/resources/assets/js/code.js +++ b/resources/assets/js/code.js @@ -1,5 +1,6 @@ require('codemirror/mode/css/css'); require('codemirror/mode/clike/clike'); +require('codemirror/mode/diff/diff'); require('codemirror/mode/go/go'); require('codemirror/mode/htmlmixed/htmlmixed'); require('codemirror/mode/javascript/javascript'); @@ -26,6 +27,7 @@ const modeMap = { 'c++': 'clike', 'c#': 'clike', csharp: 'clike', + diff: 'diff', go: 'go', html: 'htmlmixed', javascript: 'javascript', @@ -42,6 +44,7 @@ const modeMap = { ruby: 'ruby', rb: 'ruby', shell: 'shell', + sh: 'shell', bash: 'shell', toml: 'toml', sql: 'sql', @@ -96,7 +99,6 @@ module.exports.wysiwygView = function(elem) { let lang = (elem.className || '').replace('language-', ''); if (lang === '' && codeElem) { - console.log(codeElem.className); lang = (codeElem.className || '').replace('language-', '') } @@ -167,6 +169,10 @@ module.exports.markdownEditor = function(elem) { theme: 'base16-light', lineWrapping: true }); +}; +module.exports.getMetaKey = function() { + let mac = CodeMirror.keyMap["default"] == CodeMirror.keyMap.macDefault; + return mac ? "Cmd" : "Ctrl"; };