Code cleanup, bug squashing

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

diff --git a/resources/js/services/code.js b/resources/js/services/code.js
index 29b1bde8e160c1895884ae2cc06bf52de13221df..e2aca1aad9e681d94a23763c95e550712e1bedfa 100644 (file)
--- a/resources/js/services/code.js
+++ b/resources/js/services/code.js
@@ -15,6 +15,7 @@ import 'codemirror/mode/lua/lua';
 import 'codemirror/mode/markdown/markdown';
 import 'codemirror/mode/mllike/mllike';
 import 'codemirror/mode/nginx/nginx';
 import 'codemirror/mode/markdown/markdown';
 import 'codemirror/mode/mllike/mllike';
 import 'codemirror/mode/nginx/nginx';

+import 'codemirror/mode/perl/perl';

 import 'codemirror/mode/pascal/pascal';
 import 'codemirror/mode/php/php';
 import 'codemirror/mode/powershell/powershell';
 import 'codemirror/mode/pascal/pascal';
 import 'codemirror/mode/php/php';
 import 'codemirror/mode/powershell/powershell';


@@ -25,6 +26,7 @@ import 'codemirror/mode/rust/rust';
 import 'codemirror/mode/shell/shell';
 import 'codemirror/mode/sql/sql';
 import 'codemirror/mode/toml/toml';
 import 'codemirror/mode/shell/shell';
 import 'codemirror/mode/sql/sql';
 import 'codemirror/mode/toml/toml';

+import 'codemirror/mode/vbscript/vbscript';

 import 'codemirror/mode/xml/xml';
 import 'codemirror/mode/yaml/yaml';
 
 import 'codemirror/mode/xml/xml';
 import 'codemirror/mode/yaml/yaml';
 


@@ -62,6 +64,8 @@ const modeMap = {
     markdown: 'markdown',
     ml: 'mllike',
     nginx: 'nginx',
     markdown: 'markdown',
     ml: 'mllike',
     nginx: 'nginx',

+    perl: 'perl',
+    pl: 'perl',

     powershell: 'powershell',
     properties: 'properties',
     ocaml: 'mllike',
     powershell: 'powershell',
     properties: 'properties',
     ocaml: 'mllike',


@@ -81,6 +85,8 @@ const modeMap = {
     bash: 'shell',
     toml: 'toml',
     sql: 'text/x-sql',
     bash: 'shell',
     toml: 'toml',
     sql: 'text/x-sql',

+    vbs: 'vbscript',
+    vbscript: 'vbscript',

     xml: 'xml',
     yaml: 'yaml',
     yml: 'yaml',
     xml: 'xml',
     yaml: 'yaml',
     yml: 'yaml',


@@ -114,7 +120,7 @@ function highlightWithin(parent) {
 function highlightElem(elem) {
     const innerCodeElem = elem.querySelector('code[class^=language-]');
     elem.innerHTML = elem.innerHTML.replace(/<br\s*[\/]?>/gi ,'\n');
 function highlightElem(elem) {
     const innerCodeElem = elem.querySelector('code[class^=language-]');
     elem.innerHTML = elem.innerHTML.replace(/<br\s*[\/]?>/gi ,'\n');

-    const content = elem.textContent;
+    const content = elem.textContent.trimEnd();

 
     let mode = '';
     if (innerCodeElem !== null) {
 
     let mode = '';
     if (innerCodeElem !== null) {


@@ -188,7 +194,8 @@ function getMode(suggestion, content) {
  * @returns {*|string}
  */
 function getTheme() {
  * @returns {*|string}
  */
 function getTheme() {

-    return window.codeTheme || 'default';
+    const darkMode = document.documentElement.classList.contains('dark-mode');
+    return window.codeTheme || (darkMode ? 'darcula' : 'default');

 }
 
 /**
 }
 
 /**