Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 02:16:05 +01:00
Code Issues Packages Projects Releases Activity

fix demo document word count widget with contain: none

Browse Source
This commit is contained in:
zadam
2020-10-10 21:08:28 +02:00
parent 42daf181d3
commit 4eb9ca7b46
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
db/demo.zip
View File

Binary file not shown.

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

@@ -369,8 +369,7 @@ export default class NoteTreeWidget extends TabAwareWidget {
data.dataTransfer.setData("text", JSON.stringify(notes)); data.dataTransfer.setData("text", JSON.stringify(notes));
return true; // allow dragging to start return true; // allow dragging to start
}, },
dragEnter: (node, data) => true, // allow drop on any node dragEnter: (node, data) => node.data.noteType !== 'search',
dragOver: (node, data) => true,
dragDrop: async (node, data) => { dragDrop: async (node, data) => {
if ((data.hitMode === 'over' && node.data.noteType === 'search') || if ((data.hitMode === 'over' && node.data.noteType === 'search') ||
(['after', 'before'].includes(data.hitMode) (['after', 'before'].includes(data.hitMode)
@@ -1154,6 +1153,12 @@ export default class NoteTreeWidget extends TabAwareWidget {
utils.assertArguments(branchId); utils.assertArguments(branchId);
const branch = treeCache.getBranch(branchId); const branch = treeCache.getBranch(branchId);
if (!branch) {
// in case of virtual branches there's nothing to update
return;
}
branch.isExpanded = isExpanded; branch.isExpanded = isExpanded;
await server.put(`branches/${branchId}/expanded/${isExpanded ? 1 : 0}`); await server.put(`branches/${branchId}/expanded/${isExpanded ? 1 : 0}`);