Allow mermaid theme to be set via editorTheme and custom themes

Fixes #4274
This commit is contained in:
Nick O'Leary 2023-11-20 17:47:39 +00:00
parent 3dec609459
commit e945deeab6
No known key found for this signature in database
GPG Key ID: 4F2157149161A6C9
3 changed files with 7 additions and 1 deletions

View File

@ -339,6 +339,8 @@ module.exports = {
} }
theme.codeEditor = theme.codeEditor || {} theme.codeEditor = theme.codeEditor || {}
theme.codeEditor.options = Object.assign({}, themePlugin.monacoOptions, theme.codeEditor.options); theme.codeEditor.options = Object.assign({}, themePlugin.monacoOptions, theme.codeEditor.options);
theme.mermaid = Object.assign({}, themePlugin.mermaidOptions, theme.mermaid)
} }
activeThemeInitialised = true; activeThemeInitialised = true;
} }

View File

@ -15,7 +15,8 @@ RED.editor.mermaid = (function () {
'vendor/mermaid/mermaid.min.js', 'vendor/mermaid/mermaid.min.js',
function (data, stat, jqxhr) { function (data, stat, jqxhr) {
mermaid.initialize({ mermaid.initialize({
startOnLoad: false startOnLoad: false,
theme: RED.settings.get('mermaid', {}).theme
}) })
loaded = true loaded = true
while(pendingEvals.length > 0) { while(pendingEvals.length > 0) {

View File

@ -99,6 +99,9 @@ var api = module.exports = {
safeSettings.markdownEditor = runtime.settings.editorTheme.markdownEditor || {}; safeSettings.markdownEditor = runtime.settings.editorTheme.markdownEditor || {};
safeSettings.markdownEditor.mermaid = safeSettings.markdownEditor.mermaid || { enabled: true }; safeSettings.markdownEditor.mermaid = safeSettings.markdownEditor.mermaid || { enabled: true };
} }
if (runtime.settings.editorTheme.mermaid) {
safeSettings.mermaid = runtime.settings.editorTheme.mermaid
}
} }
safeSettings.libraries = runtime.library.getLibraries(); safeSettings.libraries = runtime.library.getLibraries();
if (util.isArray(runtime.settings.paletteCategories)) { if (util.isArray(runtime.settings.paletteCategories)) {