diff --git a/package.json b/package.json index c551fce27..c8e139134 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "express-session": "1.17.1", "file-type": "14.6.2", "fs-extra": "9.0.1", - "helmet": "3.23.1", + "helmet": "3.23.2", "html": "1.0.0", "html2plaintext": "2.1.2", "http-proxy-agent": "4.0.1", diff --git a/src/public/app/widgets/note_tree.js b/src/public/app/widgets/note_tree.js index 596a24f5b..270fac24e 100644 --- a/src/public/app/widgets/note_tree.js +++ b/src/public/app/widgets/note_tree.js @@ -559,6 +559,27 @@ export default class NoteTreeWidget extends TabAwareWidget { } } + updateNode(node) { + const note = treeCache.getNoteFromCache(node.data.noteId); + const branch = treeCache.getBranch(node.data.branchId); + + const isFolder = this.isFolder(note); + const title = (branch.prefix ? (branch.prefix + " - ") : "") + note.title; + + node.data.isProtected = note.isProtected; + node.data.noteType = note.type; + node.folder = isFolder; + node.icon = this.getIcon(note, isFolder); + node.extraClasses = this.getExtraClasses(note); + node.title = utils.escapeHtml(title); + + if (node.isExpanded() !== branch.isExpanded) { + node.setExpanded(branch.isExpanded, {noEvents: true}); + } + + node.renderTitle(); + } + async prepareNode(branch) { const note = await branch.getNote(); @@ -861,27 +882,6 @@ export default class NoteTreeWidget extends TabAwareWidget { return this.getNodeFromPath(notePath, true, logErrors); } - updateNode(node) { - const note = treeCache.getNoteFromCache(node.data.noteId); - const branch = treeCache.getBranch(node.data.branchId); - - const isFolder = this.isFolder(note); - const title = (branch.prefix ? (branch.prefix + " - ") : "") + note.title; - - node.data.isProtected = note.isProtected; - node.data.noteType = note.type; - node.folder = isFolder; - node.icon = this.getIcon(note, isFolder); - node.extraClasses = this.getExtraClasses(note); - node.title = utils.escapeHtml(title); - - if (node.isExpanded() !== branch.isExpanded) { - node.setExpanded(branch.isExpanded, {noEvents: true}); - } - - node.renderTitle(); - } - /** @return {FancytreeNode[]} */ getNodesByBranchId(branchId) { utils.assertArguments(branchId); diff --git a/src/routes/api/notes.js b/src/routes/api/notes.js index 5a69ad429..e4c706a65 100644 --- a/src/routes/api/notes.js +++ b/src/routes/api/notes.js @@ -171,7 +171,7 @@ function changeTitle(req) { note.save(); if (noteTitleChanged) { - await noteService.triggerNoteTitleChanged(note); + noteService.triggerNoteTitleChanged(note); } return note; diff --git a/src/services/handlers.js b/src/services/handlers.js index 3b94609f4..8f5baafa9 100644 --- a/src/services/handlers.js +++ b/src/services/handlers.js @@ -69,7 +69,7 @@ eventService.subscribe(eventService.ENTITY_CREATED, ({ entityName, entity }) => note.setContent(targetNote.getContent()); } else if (entity.type === 'label' && entity.name === 'sorted') { - await treeService.sortNotesAlphabetically(entity.noteId); + treeService.sortNotesAlphabetically(entity.noteId); } } else if (entityName === 'notes') {