X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/ddb7f33868ea499ab8f48a7062f145e8c0fbe02f..refs/pull/1762/head:/resources/js/services/code.js diff --git a/resources/js/services/code.js b/resources/js/services/code.js index ca66bdb5a..f69f28b8e 100644 --- a/resources/js/services/code.js +++ b/resources/js/services/code.js @@ -16,6 +16,7 @@ import 'codemirror/mode/mllike/mllike'; import 'codemirror/mode/nginx/nginx'; import 'codemirror/mode/php/php'; import 'codemirror/mode/powershell/powershell'; +import 'codemirror/mode/properties/properties'; import 'codemirror/mode/python/python'; import 'codemirror/mode/ruby/ruby'; import 'codemirror/mode/rust/rust'; @@ -28,6 +29,8 @@ import 'codemirror/mode/yaml/yaml'; // Addons import 'codemirror/addon/scroll/scrollpastend'; +// Mapping of potential languages or formats from user input +// to their proper codemirror modes. const modeMap = { css: 'css', c: 'text/x-csrc', @@ -42,6 +45,7 @@ const modeMap = { haskell: 'haskell', hs: 'haskell', html: 'htmlmixed', + ini: 'properties', javascript: 'javascript', json: {name: 'javascript', json: true}, js: 'javascript', @@ -54,6 +58,7 @@ const modeMap = { ml: 'mllike', nginx: 'nginx', powershell: 'powershell', + properties: 'properties', ocaml: 'mllike', php: 'php', py: 'python', @@ -102,6 +107,7 @@ function highlightElem(elem) { value: content, mode: mode, lineNumbers: true, + lineWrapping: false, theme: getTheme(), readOnly: true }); @@ -188,6 +194,7 @@ function wysiwygView(elem) { value: content, mode: getMode(lang), lineNumbers: true, + lineWrapping: false, theme: getTheme(), readOnly: true }); @@ -213,8 +220,8 @@ function popupEditor(elem, modeSuggestion) { value: content, mode: getMode(modeSuggestion), lineNumbers: true, - theme: getTheme(), - lineWrapping: true + lineWrapping: false, + theme: getTheme() }); } @@ -250,8 +257,8 @@ function markdownEditor(elem) { value: content, mode: "markdown", lineNumbers: true, - theme: getTheme(), lineWrapping: true, + theme: getTheme(), scrollPastEnd: true, };