Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix mermaid-related bugs #21431

Merged
merged 10 commits into from
Oct 15, 2022
Merged

Fix mermaid-related bugs #21431

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
68b06ca
Fix mermaid related bugs
silverwind Oct 12, 2022
3736310
improve height extraction
silverwind Oct 12, 2022
011cffa
remove array
silverwind Oct 13, 2022
78a4ef2
check the error message in processWindowErrorEvent
wxiaoguang Oct 13, 2022
67c581b
Update web_src/js/bootstrap.js
wxiaoguang Oct 13, 2022
63d1e33
Merge branch 'main' into mermaidfix
wxiaoguang Oct 13, 2022
b6117ea
Merge branch 'main' into mermaidfix
wxiaoguang Oct 13, 2022
dc5c122
Merge branch 'main' into mermaidfix
zeripath Oct 13, 2022
9520059
Merge branch 'main' into mermaidfix
wxiaoguang Oct 15, 2022
15cac27
Merge branch 'main' into mermaidfix
zeripath Oct 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions web_src/js/bootstrap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,18 @@ import {joinPaths} from './utils.js';
// This file must be imported before any lazy-loading is being attempted.
__webpack_public_path__ = joinPaths(window?.config?.assetUrlPrefix ?? '/', '/');

const ignoreErrors = [
/vs\.editor\.nullLanguage/, // https://github.com/microsoft/monaco-editor/issues/2962
];

silverwind marked this conversation as resolved.
Show resolved Hide resolved
export function showGlobalErrorMessage(msg) {
const pageContent = document.querySelector('.page-content');
if (!pageContent) return;

wxiaoguang marked this conversation as resolved.
Show resolved Hide resolved
for (const re of ignoreErrors) {
if (re.test(msg)) return;
}

const el = document.createElement('div');
el.innerHTML = `<div class="ui container negative message center aligned js-global-error" style="white-space: pre-line;"></div>`;
el.childNodes[0].textContent = msg;
Expand Down
2 changes: 1 addition & 1 deletion web_src/js/markup/mermaid.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export async function renderMermaid() {
// can't use bindFunctions here because we can't cross the iframe boundary. This
// means js-based interactions won't work but they aren't intended to work either
mermaid.mermaidAPI.render('mermaid', source, (svgStr) => {
const heightStr = (svgStr.match(/height="(.+?)"/) || [])[1];
const heightStr = (svgStr.match(/viewBox="(.+?)"/) || ['', ''])[1].split(/\s+/)[3];
if (!heightStr) return displayError(el, new Error('Could not determine chart height'));
const iframe = document.createElement('iframe');
iframe.classList.add('markup-render');
Expand Down