X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/50ee1462adeb249a7ae378a7ea025db3fb69c5b9..refs/pull/1034/head:/resources/assets/js/services/code.js diff --git a/resources/assets/js/services/code.js b/resources/assets/js/services/code.js index de863e09f..e1b94e8d2 100644 --- a/resources/assets/js/services/code.js +++ b/resources/assets/js/services/code.js @@ -1,3 +1,7 @@ +const CodeMirror = require('codemirror'); +const Clipboard = require("clipboard"); + +// Modes require('codemirror/mode/css/css'); require('codemirror/mode/clike/clike'); require('codemirror/mode/diff/diff'); @@ -16,9 +20,8 @@ require('codemirror/mode/toml/toml'); require('codemirror/mode/xml/xml'); require('codemirror/mode/yaml/yaml'); -const Clipboard = require("clipboard"); - -const CodeMirror = require('codemirror'); +// Addons +require('codemirror/addon/scroll/scrollpastend'); const modeMap = { css: 'css', @@ -113,7 +116,7 @@ function addCopyIcon(cmInstance) { copyButton.classList.add('success'); setTimeout(() => { copyButton.classList.remove('success'); - }, 360); + }, 240); }); } @@ -238,7 +241,8 @@ function markdownEditor(elem) { mode: "markdown", lineNumbers: true, theme: getTheme(), - lineWrapping: true + lineWrapping: true, + scrollPastEnd: true, }); } @@ -253,7 +257,6 @@ function getMetaKey() { module.exports = { highlight: highlight, - highlightElem: highlightElem, wysiwygView: wysiwygView, popupEditor: popupEditor, setMode: setMode,