Tools/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2025-10-27 01:51:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix double refresh of note map

Browse Source
This commit is contained in:
zadam 2021-09-28 13:27:21 +02:00
parent 0264e847ef
commit 5358b58191
4 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/public/app/widgets/note_context_aware_widget.js
View File

@ -1,5 +1,4 @@
import BasicWidget from "./basic_widget.js";
import appContext from "../services/app_context.js";
export default class NoteContextAwareWidget extends BasicWidget {
isNoteContext(ntxId) {

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

@ -117,15 +117,15 @@ export default class NoteMapWidget extends NoteContextAwareWidget {
.linkCanvasObjectMode(() => "after");
}
let mapRootNoteId = this.getMapRootNoteId();
const data = await this.loadNotesAndRelations(mapRootNoteId);
const nodeLinkRatio = data.nodes.length / data.links.length;
this.graph.d3Force('link').distance(40);
this.graph.d3Force('center').strength(0.01);
this.graph.d3Force('charge').strength(-30);
this.graph.d3Force('charge').strength(-20 / nodeLinkRatio);
this.graph.d3Force('charge').distanceMax(1000);
let mapRootNoteId = this.getMapRootNoteId();
const data = await this.loadNotesAndRelations(mapRootNoteId);
this.renderData(data);
}

11
src/public/app/widgets/type_widgets/type_widget.js
View File

@ -48,4 +48,15 @@ export default class TypeWidget extends NoteContextAwareWidget {
this.focus();
}
}
// events should be propagated manually to the children widgets
handleEventInChildren(name, data) {
if (['activeContextChanged', 'setNoteContext'].includes(name)) {
// won't trigger .refresh();
return super.handleEventInChildren('setNoteContext', data);
}
else {
return Promise.resolve();
}
}
}

1
src/services/consistency_checks.js
View File

@ -9,7 +9,6 @@ const cls = require('./cls');
const entityChangesService = require('./entity_changes');
const optionsService = require('./options');
const Branch = require('../becca/entities/branch');
const dateUtils = require('./date_utils');
const attributeService = require('./attributes');
const noteRevisionService = require('./note_revisions');
const becca = require("../becca/becca");