Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-13 00:35:50 +01:00
Code Issues Packages Projects Releases Activity

Merge remote-tracking branch 'origin/master' into dev

Browse Source 
# Conflicts:
#	package-lock.json
#	src/public/app/widgets/mermaid.js
This commit is contained in:
zadam
2023-02-15 23:47:41 +01:00
parent 127486fdf5 22cea63863
commit 42e08284b0
5 changed files with 48 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
src/public/app/widgets/mermaid.js
View File

@@ -75,44 +75,45 @@ export default class MermaidWidget extends NoteContextAwareWidget {
const wheelZoomLoaded = libraryLoader.requireLibrary(libraryLoader.WHEEL_ZOOM);
try {
const renderedSvg = await this.renderSvg();
this.$display.html(renderedSvg);
await this.renderSvg(async renderedSvg => {
this.$display.html(renderedSvg);
// not awaiting intentionally
// this is pretty hacky since we update ancillary on render
// but if nothing changed this should not trigger DB write and sync
server.put(`notes/${note.noteId}/ancillaries/mermaidSvg`, {
mime: 'image/svg+xml',
content: renderedSvg
// not awaiting intentionally
// this is pretty hacky since we update ancillary on render
// but if nothing changed this should not trigger DB write and sync
server.put(`notes/${note.noteId}/ancillaries/mermaidSvg`, {
mime: 'image/svg+xml',
content: renderedSvg
});
await wheelZoomLoaded;
this.$display.attr("id", `mermaid-render-${idCounter}`);
WZoom.create(`#mermaid-render-${idCounter}`, {
type: 'html',
maxScale: 10,
speed: 20,
zoomOnClick: false
});
this.$errorContainer.hide();
});
await wheelZoomLoaded;
this.$display.attr("id", `mermaid-render-${idCounter}`);
WZoom.create(`#mermaid-render-${idCounter}`, {
type: 'html',
maxScale: 10,
speed: 20,
zoomOnClick: false
});
this.$errorContainer.hide();
} catch (e) {
this.$errorMessage.text(e.message);
this.$errorContainer.show();
}
}
renderSvg() {
return new Promise(async res => {
idCounter++;
async renderSvg(cb) {
idCounter++;
const noteComplement = await froca.getNoteComplement(this.noteId);
const content = noteComplement.content || "";
const noteComplement = await froca.getNoteComplement(this.noteId);
const content = noteComplement.content || "";
mermaid.mermaidAPI.render(`mermaid-graph-${idCounter}`, content, res);
});
// this can't be promisified since in case of error this both calls callback with error SVG and throws exception
// with error details
mermaid.mermaidAPI.render(`mermaid-graph-${idCounter}`, content, cb);
}
async entitiesReloadedEvent({loadResults}) {
@@ -126,9 +127,9 @@ export default class MermaidWidget extends NoteContextAwareWidget {
return;
}
const renderedSvg = await this.renderSvg();
this.download(`${this.note.title}.svg`, renderedSvg);
await this.renderSvg(renderedSvg => {
this.download(`${this.note.title}.svg`, renderedSvg);
});
}
download(filename, text) {