Merge pull request #1075 from junaidrsd/fix-markdown-escape-hljs

escape hljs attributed div and markdown-it version update

Author: varya

lib/modules/markdown.js

@@ -54,18 +54,20 @@ module.exports = {
     $('pre > code').each(function() {
       var code = $(this);
       var lang = '';
-      // Capture any "language-" className values
-      if (code.attr('class')) {
-        lang = code.attr('class').split(/\s+/).reduce(function(pv, cv) {
-          return pv + (cv.startsWith('language-') ? cv.substr(9 - cv.length) + ' ' : '');
-        }, '').trim();
-      }
-      // Replace parent PRE element with hljs attributed DIV
-      code.parent().replaceWith(
+      if(code.attr('class') !== 'lang-escape-hljs') {
+        // Capture any "language-" className values
+        if (code.attr('class')) {
+          lang = code.attr('class').split(/\s+/).reduce(function(pv, cv) {
+            return pv + (cv.startsWith('language-') ? cv.substr(9 - cv.length) + ' ' : '');
+          }, '').trim();
+        }
+        //Replace parent PRE element with hljs attributed DIV
+        code.parent().replaceWith(
           '<div hljs' + (lang.length ? ' hljs-language="' + lang + '"' : '') + '>' +
           code.html() +
           '</div>'
-      );
+        );
+      }
     });
     $('p, a, li, pre, h1, h2, h3, h4, h5, h6, table, thead, tbody, tr, th, td').not('[sg-no-style]').addClass('sg');
     excludeLinks.forEach(function(link) {

package.json

@@ -51,7 +51,7 @@
     "gulp-util": "~3.0.5",
     "kss": "~2.1.0",
     "lodash": "~3.10.1",
-    "markdown-it": "^5.1.0",
+    "markdown-it": "^8.3.1",
     "minimatch": "~3.0.0",
     "minimist": "^1.2.0",
     "morgan": "~1.6.0",