The_Great_Archive/cryptpad
1
0
Fork 0
mirror of https://github.com/cryptpad/cryptpad.git synced 2026-09-14 11:05:41 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fix Mermaid diagrams merged together #1244

Browse Source
This commit is contained in:
yflory 2023-09-25 14:55:21 +02:00
parent f4284e448f
commit 0d286160de
1 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
www/common/diffMarked.js
View File

@ -31,9 +31,15 @@ define([
"g.grid g.tick line { opacity: 0.25; }" +
"g.today line { stroke: red; stroke-width: 1; stroke-dasharray: 3; opacity: 0.5; }";
var onMermaidRunEvt = Util.mkEvent(true);
var onMermaidRun = () => {
onMermaidRunEvt.fire();
onMermaidRunEvt = Util.mkEvent(true);
};
var Mermaid = {
__stubbed: true,
init: function () {
run: function (cb) {
onMermaidRunEvt.reg(cb);
require([
'mermaid',
'/lib/mermaid/mermaid-zenuml.esm.min.js',
@ -47,6 +53,18 @@ define([
theme: (window.CryptPad_theme === 'dark') ? 'dark' : 'default',
"themeCSS": mermaidThemeCSS,
});
onMermaidRun();
var run = Mermaid.run;
var to;
Mermaid.run = (cb) => {
clearTimeout(to);
onMermaidRunEvt.reg(cb);
to = setTimeout(() => {
onMermaidRun();
run();
});
};
}
Mermaid.registerExternalDiagrams([zenuml]).then(() => pluginLoaded.fire());
@ -504,12 +522,13 @@ define([
name: 'mermaid',
attr: 'mermaid-source',
render: function ($el) {
Mermaid.init(undefined, $el);
// clickable elements in mermaid don't work well with our sandboxing setup
// the function below strips clickable elements but still leaves behind some artifacts
// tippy tooltips might still be useful, so they're not removed. It would be
// preferable to just support links, but this covers up a rough edge in the meantime
removeMermaidClickables($el);
Mermaid.run(() => {
// clickable elements in mermaid don't work well with our sandboxing setup
// the function below strips clickable elements but still leaves behind some artifacts
// tippy tooltips might still be useful, so they're not removed. It would be
// preferable to just support links, but this covers up a rough edge in the meantime
removeMermaidClickables($el);
});
}
};