do not highlight code blocks without lang specified by default

src/resources/hoedown.js

@@ -3,11 +3,15 @@ var placeholder = document.getElementById('placeholder');
 // Use Marked to highlight code blocks in edit mode.
 marked.setOptions({
     highlight: function(code, lang) {
-        if (lang && hljs.getLanguage(lang)) {
+        if (lang) {
+            if (hljs.getLanguage(lang)) {
                 return hljs.highlight(lang, code).value;
             } else {
                 return hljs.highlightAuto(code).value;
             }
+        } else {
+            return code;
+        }
     }
 });
 
@@ -37,9 +41,11 @@ var updateHtml = function(html) {
                 }
             }
 
+            if (listContainsRegex(code.classList, /language-.*/)) {
                 hljs.highlightBlock(code);
             }
         }
+    }
 
     addClassToCodeBlock();
     renderCodeBlockLineNumber();
@@ -63,4 +69,3 @@ var highlightText = function(text, id, timeStamp) {
     var html = marked(text);
     content.highlightTextCB(html, id, timeStamp);
 }
-

src/resources/markdown-it.js

@@ -44,11 +44,15 @@ var mdit = window.markdownit({
     typographer: true,
     langPrefix: 'lang-',
     highlight: function(str, lang) {
-        if (lang && hljs.getLanguage(lang)) {
+        if (lang) {
+            if (hljs.getLanguage(lang)) {
                 return hljs.highlight(lang, str).value;
             } else {
                 return hljs.highlightAuto(str).value;
             }
+        } else {
+            return str;
+        }
     }
 });
 

src/resources/markdown_template.js

@@ -844,3 +844,13 @@ var addClassToCodeBlock = function() {
         }
     }
 };
+
+var listContainsRegex = function(strs, exp) {
+    for (var i = 0, len = strs.length; i < len; ++i) {
+        if (exp.test(strs[i])) {
+            return true;
+        }
+    }
+
+    return false;
+}

src/resources/marked.js

@@ -17,11 +17,15 @@ renderer.heading = function(text, level) {
 // Highlight.js to highlight code block
 marked.setOptions({
     highlight: function(code, lang) {
-        if (lang && hljs.getLanguage(lang)) {
+        if (lang) {
+            if (hljs.getLanguage(lang)) {
                 return hljs.highlight(lang, code).value;
             } else {
                 return hljs.highlightAuto(code).value;
             }
+        } else {
+            return code;
+        }
     }
 });
 

src/resources/showdown.js

@@ -60,7 +60,9 @@ var highlightCodeBlocks = function(doc, enableMermaid, enableFlowchart) {
             } if (enableFlowchart && code.classList.contains('language-flowchart')) {
                 // Flowchart code block.
                 continue;
-            } else {
+            }
+
+            if (listContainsRegex(code.classList, /language-.*/)) {
                 hljs.highlightBlock(code);
             }
         }