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

don't display mermaid if the note is encrypted without protected session

Browse Source
This commit is contained in:
zadam
2022-07-28 23:59:41 +02:00
parent 6d990de450
commit ef6b7a85d5
4 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/public/app/entities/note_short.js
View File

@@ -3,6 +3,7 @@ import noteAttributeCache from "../services/note_attribute_cache.js";
import ws from "../services/ws.js";
import options from "../services/options.js";
import froca from "../services/froca.js";
import protectedSessionHolder from "../services/protected_session_holder.js";
const LABEL = 'label';
const RELATION = 'relation';
@@ -812,6 +813,10 @@ class NoteShort {
return false;
}
isContentAvailable() {
return !this.isProtected || protectedSessionHolder.isProtectedSessionAvailable()
}
}
export default NoteShort;

2
src/public/app/layouts/desktop_layout.js
View File

@@ -180,8 +180,8 @@ export default class DesktopLayout {
.child(new SharedInfoWidget())
.child(new NoteUpdateStatusWidget())
.child(new FloatingButtons()
.child(new BacklinksWidget())
.child(new RelationMapButtons())
.child(new BacklinksWidget())
)
.child(new MermaidWidget())
.child(

4
src/public/app/widgets/floating_buttons/floating_buttons.js
View File

@@ -16,6 +16,10 @@ const TPL = `
z-index: 100;
}
.floating-buttons-children > * {
margin-left: 10px;
}
.floating-buttons .floating-button {
font-size: 130%;
padding: 5px 10px 4px 10px;

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

@@ -33,7 +33,9 @@ let idCounter = 1;
export default class MermaidWidget extends NoteContextAwareWidget {
isEnabled() {
return super.isEnabled() && this.note && this.note.type === 'mermaid';
return super.isEnabled()
&& this.note?.type === 'mermaid'
&& this.note.isContentAvailable();
}
doRender() {