Update/fix german translation

[bookstack] / resources / assets / js / code.js

diff --git a/resources/assets/js/code.js b/resources/assets/js/code.js
index 020c38365dd79b02a96aeecf51edbd85e073cdd0..014c4eb779674fc1234bd9b07aec90618e4afc10 100644 (file)
--- 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/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');
 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',
     'c++': 'clike',
     'c#': 'clike',
     csharp: 'clike',

+    diff: 'diff',

     go: 'go',
     html: 'htmlmixed',
     javascript: 'javascript',
     go: 'go',
     html: 'htmlmixed',
     javascript: 'javascript',


@@ -42,6 +44,7 @@ const modeMap = {
     ruby: 'ruby',
     rb: 'ruby',
     shell: 'shell',
     ruby: 'ruby',
     rb: 'ruby',
     shell: 'shell',

+    sh: 'shell',

     bash: 'shell',
     toml: 'toml',
     sql: 'sql',
     bash: 'shell',
     toml: 'toml',
     sql: 'sql',


@@ -52,45 +55,124 @@ const modeMap = {
 
 module.exports.highlight = function() {
     let codeBlocks = document.querySelectorAll('.page-content pre');
 
 module.exports.highlight = function() {
     let codeBlocks = document.querySelectorAll('.page-content pre');

-

     for (let i = 0; i < codeBlocks.length; i++) {
     for (let i = 0; i < codeBlocks.length; i++) {

-        let innerCodeElem = codeBlocks[i].querySelector('code[class^=language-]');
-        let mode = '';
-        if (innerCodeElem !== null) {
-            let langName = innerCodeElem.className.replace('language-', '');
-            if (typeof modeMap[langName] !== 'undefined') mode = modeMap[langName];
-        }
-        codeBlocks[i].innerHTML = codeBlocks[i].innerHTML.replace(/<br\s*[\/]?>/gi ,'\n');
-        let content = codeBlocks[i].textContent;
-        console.log('MODE', mode);
-
-        CodeMirror(function(elt) {
-            codeBlocks[i].parentNode.replaceChild(elt, codeBlocks[i]);
-        }, {
-            value: content,
-            mode:  mode,
-            lineNumbers: true,
-            theme: 'base16-light',
-            readOnly: true
-        });
+        highlightElem(codeBlocks[i]);
+    }
+};
+
+function highlightElem(elem) {
+    let innerCodeElem = elem.querySelector('code[class^=language-]');
+    let mode = '';
+    if (innerCodeElem !== null) {
+        let langName = innerCodeElem.className.replace('language-', '');
+        mode = getMode(langName);
+    }
+    elem.innerHTML = elem.innerHTML.replace(/<br\s*[\/]?>/gi ,'\n');
+    let content = elem.textContent;
+
+    CodeMirror(function(elt) {
+        elem.parentNode.replaceChild(elt, elem);
+    }, {
+        value: content,
+        mode:  mode,
+        lineNumbers: true,
+        theme: 'base16-light',
+        readOnly: true
+    });
+}
+
+/**
+ * Search for a codemirror code based off a user suggestion
+ * @param suggestion
+ * @returns {string}
+ */
+function getMode(suggestion) {
+    suggestion = suggestion.trim().replace(/^\./g, '').toLowerCase();
+    return (typeof modeMap[suggestion] !== 'undefined') ? modeMap[suggestion] : '';
+}
+
+module.exports.highlightElem = highlightElem;
+
+module.exports.wysiwygView = function(elem) {
+    let doc = elem.ownerDocument;
+    let codeElem = elem.querySelector('code');
+
+    let lang = (elem.className || '').replace('language-', '');
+    if (lang === '' && codeElem) {
+        lang = (codeElem.className || '').replace('language-', '')

     }
 
     }
 

+    elem.innerHTML = elem.innerHTML.replace(/<br\s*[\/]?>/gi ,'\n');
+    let content = elem.textContent;
+    let newWrap = doc.createElement('div');
+    let newTextArea = doc.createElement('textarea');
+
+    newWrap.className = 'CodeMirrorContainer';
+    newWrap.setAttribute('data-lang', lang);
+    newTextArea.style.display = 'none';
+    elem.parentNode.replaceChild(newWrap, elem);
+
+    newWrap.appendChild(newTextArea);
+    newWrap.contentEditable = false;
+    newTextArea.textContent = content;
+
+    let cm = CodeMirror(function(elt) {
+        newWrap.appendChild(elt);
+    }, {
+        value: content,
+        mode:  getMode(lang),
+        lineNumbers: true,
+        theme: 'base16-light',
+        readOnly: true
+    });
+    setTimeout(() => {
+        cm.refresh();
+    }, 300);
+    return {wrap: newWrap, editor: cm};
+};
+
+module.exports.popupEditor = function(elem, modeSuggestion) {
+    let content = elem.textContent;
+
+    return CodeMirror(function(elt) {
+        elem.parentNode.insertBefore(elt, elem);
+        elem.style.display = 'none';
+    }, {
+        value: content,
+        mode:  getMode(modeSuggestion),
+        lineNumbers: true,
+        theme: 'base16-light',
+        lineWrapping: true
+    });
+};
+
+module.exports.setMode = function(cmInstance, modeSuggestion) {
+      cmInstance.setOption('mode', getMode(modeSuggestion));
+};
+module.exports.setContent = function(cmInstance, codeContent) {
+    cmInstance.setValue(codeContent);
+    setTimeout(() => {
+        cmInstance.refresh();
+    }, 10);

 };
 
 module.exports.markdownEditor = function(elem) {
     let content = elem.textContent;
 
 };
 
 module.exports.markdownEditor = function(elem) {
     let content = elem.textContent;
 

-    let cm = CodeMirror(function(elt) {
+    return CodeMirror(function (elt) {

         elem.parentNode.insertBefore(elt, elem);
         elem.style.display = 'none';
     }, {
         value: content,
         elem.parentNode.insertBefore(elt, elem);
         elem.style.display = 'none';
     }, {
         value: content,

-        mode:  "markdown",
+        mode: "markdown",

         lineNumbers: true,
         theme: 'base16-light',
         lineWrapping: true
     });
         lineNumbers: true,
         theme: 'base16-light',
         lineWrapping: true
     });

-    return cm;
+};

 
 

+module.exports.getMetaKey = function() {
+    let mac = CodeMirror.keyMap["default"] == CodeMirror.keyMap.macDefault;
+    return mac ? "Cmd" : "Ctrl";

 };
 
 };