sascha
/
Notes
mirror of https://github.com/TriliumNext/Notes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

note hoisting should be done on "hovered", not active note, closes #2124

pull/255/head
zadam 2022-11-08 22:19:16 +07:00
parent 81a59f48e6
commit bf4776a33c
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/public/app/services/entrypoints.js
Unescape Escape View File

@ -7,6 +7,7 @@ import Component from "../widgets/component.js";
import toastService from "./toast.js";
import ws from "./ws.js";
import bundleService from "./bundle.js";
import froca from "./froca.js";
export default class Entrypoints extends Component {
constructor() {
@ -46,14 +47,15 @@ export default class Entrypoints extends Component {
appContext.triggerEvent('focusAndSelectTitle', {isNewNote: true});
}
async toggleNoteHoistingCommand() {
const noteContext = appContext.tabManager.getActiveContext();
async toggleNoteHoistingCommand({noteId = appContext.tabManager.getActiveContextNoteId()}) {
const noteToHoist = await froca.getNote(noteId);
const activeNoteContext = appContext.tabManager.getActiveContext();
if (noteContext.note.noteId === noteContext.hoistedNoteId) {
await noteContext.unhoist();
if (noteToHoist.noteId === activeNoteContext.hoistedNoteId) {
await activeNoteContext.unhoist();
}
else if (noteContext.note.type !== 'search') {
await noteContext.setHoistedNoteId(noteContext.note.noteId);
else if (noteToHoist.type !== 'search') {
await activeNoteContext.setHoistedNoteId(noteId);
}
}

1
src/public/app/services/tree_context_menu.js
Unescape Escape View File

@ -133,6 +133,7 @@ class TreeContextMenu {
this.treeWidget.triggerCommand(command, {
node: this.node,
notePath: notePath,
noteId: this.node.data.noteId,
selectedOrActiveBranchIds: this.treeWidget.getSelectedOrActiveBranchIds(this.node),
selectedOrActiveNoteIds: this.treeWidget.getSelectedOrActiveNoteIds(this.node)
});