Addressed test failures from users API changes

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

diff --git a/resources/js/services/code.js b/resources/js/services/code.js
index 5727cd2b79a06f4e68b83eb68f1e1e34e2424300..d82db52710c9b0b0f15cda09ab0866d688632c49 100644 (file)
--- a/resources/js/services/code.js
+++ b/resources/js/services/code.js
@@ -26,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/vb/vb';
 import 'codemirror/mode/vbscript/vbscript';
 import 'codemirror/mode/xml/xml';
 import 'codemirror/mode/yaml/yaml';
@@ -87,6 +88,8 @@ const modeMap = {
     sql: 'text/x-sql',
     vbs: 'vbscript',
     vbscript: 'vbscript',
+    'vb.net': 'text/x-vb',
+    vbnet: 'text/x-vb',
     xml: 'xml',
     yaml: 'yaml',
     yml: 'yaml',
@@ -208,9 +211,9 @@ function wysiwygView(elem) {
     const doc = elem.ownerDocument;
     const codeElem = elem.querySelector('code');
 
-    let lang = (elem.className || '').replace('language-', '');
-    if (lang === '' && codeElem) {
-        lang = (codeElem.className || '').replace('language-', '')
+    let lang = getLanguageFromCssClasses(elem.className || '');
+    if (!lang && codeElem) {
+        lang = getLanguageFromCssClasses(codeElem.className || '');
     }
 
     elem.innerHTML = elem.innerHTML.replace(/<br\s*[\/]?>/gi ,'\n');
@@ -225,7 +228,7 @@ function wysiwygView(elem) {
     elem.parentNode.replaceChild(newWrap, elem);
 
     newWrap.appendChild(newTextArea);
-    newWrap.contentEditable = false;
+    newWrap.contentEditable = 'false';
     newTextArea.textContent = content;
 
     let cm = CodeMirror(function(elt) {
@@ -242,6 +245,16 @@ function wysiwygView(elem) {
     return {wrap: newWrap, editor: cm};
 }
 
+/**
+ * Get the code language from the given css classes.
+ * @param {String} classes
+ * @return {String}
+ */
+function getLanguageFromCssClasses(classes) {
+    const langClasses = classes.split(' ').filter(cssClass => cssClass.startsWith('language-'));
+    return (langClasses[0] || '').replace('language-', '');
+}
+
 /**
  * Create a CodeMirror instance to show in the WYSIWYG pop-up editor
  * @param {HTMLElement} elem