Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

2019-12-04 10:50:13 +01:00
parent d52acfa5d2 ff67f8381b
commit 69d8b413a6
2 changed files with 4 additions and 3 deletions
--- a/www/common/diffMarked.js
+++ b/www/common/diffMarked.js
@@ -84,7 +84,7 @@ define([

    var defaultCode = renderer.code;
    renderer.code = function (code, language) {
-        if (language === 'mermaid' && (code.match(/^sequenceDiagram/) || code.match(/^graph/))) {
+        if (language === 'mermaid' && code.match(/^(graph|pie|gantt|sequenceDiagram|classDiagram|gitGraph)/)) {
            return '<pre class="mermaid">'+code+'</pre>';
        } else {
            return defaultCode.apply(renderer, arguments);