gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 18:08:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix notemap resize + upgrade of force-graph

Browse Source
This commit is contained in:
zadam 2022-08-02 17:17:27 +02:00
parent 8a39699acd
commit 1f6222a653
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/force-graph.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
src/public/app/widgets/note_detail.js
View File

@ -156,7 +156,7 @@ export default class NoteDetailWidget extends NoteContextAwareWidget {
// https://github.com/zadam/trilium/issues/2522 // https://github.com/zadam/trilium/issues/2522
this.$widget.toggleClass("full-height", this.$widget.toggleClass("full-height",
!this.noteContext.hasNoteList() !this.noteContext.hasNoteList()
&& ['editable-text', 'editable-code', 'canvas', 'web-view'].includes(this.type) && ['editable-text', 'editable-code', 'canvas', 'web-view', 'note-map'].includes(this.type)
&& this.mime !== 'text/x-sqlite;schema=trilium'); && this.mime !== 'text/x-sqlite;schema=trilium');
} }

9
src/public/app/widgets/note_map.js
View File

@ -8,8 +8,9 @@ import linkContextMenuService from "../services/link_context_menu.js";
const TPL = `<div class="note-map-widget" style="position: relative;"> const TPL = `<div class="note-map-widget" style="position: relative;">
<style> <style>
.type-special .note-detail, .note-detail-note-map { .note-detail-note-map {
height: 100%; height: 100%;
overflow: hidden;
} }
.map-type-switcher { .map-type-switcher {
@ -51,7 +52,7 @@ export default class NoteMapWidget extends NoteContextAwareWidget {
this.$container = this.$widget.find(".note-map-container"); this.$container = this.$widget.find(".note-map-container");
this.$styleResolver = this.$widget.find('.style-resolver'); this.$styleResolver = this.$widget.find('.style-resolver');
window.addEventListener('resize', () => this.setHeight(), false); window.addEventListener('resize', () => this.setDimensions(), false);
this.$widget.find(".map-type-switcher button").on("click", async e => { this.$widget.find(".map-type-switcher button").on("click", async e => {
const type = $(e.target).closest("button").attr("data-type"); const type = $(e.target).closest("button").attr("data-type");
@ -62,7 +63,7 @@ export default class NoteMapWidget extends NoteContextAwareWidget {
super.doRender(); super.doRender();
} }
setHeight() { setDimensions() {
if (!this.graph) { // no graph has been even rendered if (!this.graph) { // no graph has been even rendered
return; return;
} }
@ -85,7 +86,7 @@ export default class NoteMapWidget extends NoteContextAwareWidget {
this.mapType = this.note.getLabelValue("mapType") === "tree" ? "tree" : "link"; this.mapType = this.note.getLabelValue("mapType") === "tree" ? "tree" : "link";
this.setHeight(); this.setDimensions();
await libraryLoader.requireLibrary(libraryLoader.FORCE_GRAPH); await libraryLoader.requireLibrary(libraryLoader.FORCE_GRAPH);

4
src/public/app/widgets/ribbon_widgets/note_map.js
View File

@ -77,7 +77,7 @@ export default class NoteMapRibbonWidget extends NoteContextAwareWidget {
this.openState = 'full'; this.openState = 'full';
this.noteMapWidget.setHeight(); this.noteMapWidget.setDimensions();
}); });
this.$collapseButton = this.$widget.find('.collapse-button'); this.$collapseButton = this.$widget.find('.collapse-button');
@ -89,7 +89,7 @@ export default class NoteMapRibbonWidget extends NoteContextAwareWidget {
this.openState = 'small'; this.openState = 'small';
this.noteMapWidget.setHeight(); this.noteMapWidget.setDimensions();
}); });
window.addEventListener('resize', () => { window.addEventListener('resize', () => {