X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/f9feeef5c94141718e7617cd67edd98ea8b2170c..refs/pull/1098/head:/resources/assets/js/services/code.js

diff --git a/resources/assets/js/services/code.js b/resources/assets/js/services/code.js
index 8a5a7a022..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,17 +20,18 @@ require('codemirror/mode/toml/toml');
 require('codemirror/mode/xml/xml');
 require('codemirror/mode/yaml/yaml');
 
-const CodeMirror = require('codemirror');
+// Addons
+require('codemirror/addon/scroll/scrollpastend');
 
 const modeMap = {
     css: 'css',
-    c: 'clike',
-    java: 'clike',
-    scala: 'clike',
-    kotlin: 'clike',
-    'c++': 'clike',
-    'c#': 'clike',
-    csharp: 'clike',
+    c: 'text/x-csrc',
+    java: 'text/x-java',
+    scala: 'text/x-scala',
+    kotlin: 'text/x-kotlin',
+    'c++': 'text/x-c++src',
+    'c#': 'text/x-csharp',
+    csharp: 'text/x-csharp',
     diff: 'diff',
     go: 'go',
     html: 'htmlmixed',
@@ -77,7 +82,7 @@ function highlightElem(elem) {
     elem.innerHTML = elem.innerHTML.replace(/<br\s*[\/]?>/gi ,'\n');
     let content = elem.textContent.trim();
 
-    CodeMirror(function(elt) {
+    let cm = CodeMirror(function(elt) {
         elem.parentNode.replaceChild(elt, elem);
     }, {
         value: content,
@@ -86,6 +91,33 @@ function highlightElem(elem) {
         theme: getTheme(),
         readOnly: true
     });
+
+    addCopyIcon(cm);
+}
+
+/**
+ * Add a button to a CodeMirror instance which copies the contents to the clipboard upon click.
+ * @param cmInstance
+ */
+function addCopyIcon(cmInstance) {
+    const copyIcon = `<svg viewBox="0 0 24 24" width="16" height="16" xmlns="http://www.w3.org/2000/svg"><path d="M0 0h24v24H0z" fill="none"/><path d="M16 1H4c-1.1 0-2 .9-2 2v14h2V3h12V1zm3 4H8c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h11c1.1 0 2-.9 2-2V7c0-1.1-.9-2-2-2zm0 16H8V7h11v14z"/></svg>`;
+    const copyButton = document.createElement('div');
+    copyButton.classList.add('CodeMirror-copy');
+    copyButton.innerHTML = copyIcon;
+    cmInstance.display.wrapper.appendChild(copyButton);
+
+    const clipboard = new Clipboard(copyButton, {
+        text: function(trigger) {
+            return cmInstance.getValue()
+        }
+    });
+
+    clipboard.on('success', event => {
+        copyButton.classList.add('success');
+        setTimeout(() => {
+            copyButton.classList.remove('success');
+        }, 240);
+    });
 }
 
 /**
@@ -128,6 +160,7 @@ function wysiwygView(elem) {
 
     newWrap.className = 'CodeMirrorContainer';
     newWrap.setAttribute('data-lang', lang);
+    newWrap.setAttribute('dir', 'ltr');
     newTextArea.style.display = 'none';
     elem.parentNode.replaceChild(newWrap, elem);
 
@@ -208,7 +241,8 @@ function markdownEditor(elem) {
         mode: "markdown",
         lineNumbers: true,
         theme: getTheme(),
-        lineWrapping: true
+        lineWrapping: true,
+        scrollPastEnd: true,
     });
 }
 
@@ -223,7 +257,6 @@ function getMetaKey() {
 
 module.exports = {
     highlight: highlight,
-    highlightElem: highlightElem,
     wysiwygView: wysiwygView,
     popupEditor: popupEditor,
     setMode: setMode,