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

fixed frontend update after note deletion

Browse Source
This commit is contained in:
zadam
2021-07-26 21:11:51 +02:00
parent 6e7b722bf2
commit 3a78a75afc
5 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/public/app/entities/attribute.js
View File

@@ -22,6 +22,8 @@ class Attribute {
this.position = row.position; this.position = row.position;
/** @param {boolean} isInheritable */ /** @param {boolean} isInheritable */
this.isInheritable = !!row.isInheritable; this.isInheritable = !!row.isInheritable;
/** @param {boolean} */
this.isDeleted = !!row.isDeleted;
} }
/** @returns {NoteShort} */ /** @returns {NoteShort} */

2
src/public/app/entities/branch.js
View File

@@ -21,6 +21,8 @@ class Branch {
this.isExpanded = !!row.isExpanded; this.isExpanded = !!row.isExpanded;
/** @param {boolean} */ /** @param {boolean} */
this.fromSearchNote = !!row.fromSearchNote; this.fromSearchNote = !!row.fromSearchNote;
/** @param {boolean} */
this.isDeleted = !!row.isDeleted;
} }
/** @returns {NoteShort} */ /** @returns {NoteShort} */

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

@@ -61,6 +61,8 @@ class NoteShort {
this.type = row.type; this.type = row.type;
/** @param {string} content-type, e.g. "application/json" */ /** @param {string} content-type, e.g. "application/json" */
this.mime = row.mime; this.mime = row.mime;
/** @param {boolean} */
this.isDeleted = !!row.isDeleted;
} }
addParent(parentNoteId, branchId) { addParent(parentNoteId, branchId) {

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

@@ -455,6 +455,11 @@ export default class NoteTreeWidget extends NoteContextAwareWidget {
} }
const note = await froca.getNote(node.data.noteId); const note = await froca.getNote(node.data.noteId);
if (!note || note.isDeleted) {
return;
}
const activeNoteContext = appContext.tabManager.getActiveContext(); const activeNoteContext = appContext.tabManager.getActiveContext();
const $span = $(node.span); const $span = $(node.span);

9
src/public/stylesheets/tree.css
View File

@@ -11,7 +11,8 @@ span.fancytree-node.fancytree-hide {
} }
.fancytree-title { .fancytree-title {
margin-left: 7px !important; margin-left: 7px;
outline: none;
} }
.fancytree-expander { .fancytree-expander {
@@ -54,7 +55,7 @@ span.fancytree-node.fancytree-hide {
} }
.fancytree-loading span.fancytree-expander { .fancytree-loading span.fancytree-expander {
background-image: none !important; background-image: none;
display: inline-block; display: inline-block;
width: 16px; width: 16px;
height: 16px; height: 16px;
@@ -119,8 +120,8 @@ span.fancytree-node.muted { opacity: 0.6; }
} }
ul.fancytree-container { ul.fancytree-container {
outline: none !important; outline: none;
background-color: inherit !important; background-color: inherit;
} }
.fancytree-custom-icon { .fancytree-custom-icon {