hoisting notes WIP

This commit is contained in:
azivner
2018-12-11 21:53:56 +01:00
parent 8171b68b18
commit 6fbf28b30d
8 changed files with 67 additions and 6 deletions

View File

@@ -4,6 +4,10 @@ function initContextMenu(event, contextMenuItems, selectContextMenuItem) {
$contextMenuContainer.empty();
for (const item of contextMenuItems) {
if (item.hidden) {
continue;
}
if (item.title === '----') {
$contextMenuContainer.append($("<div>").addClass("dropdown-divider"));
} else {

View File

@@ -0,0 +1,25 @@
import optionsInit from './options_init.js';
import server from "./server.js";
let hoistedNoteId;
optionsInit.optionsReady.then(options => {
hoistedNoteId = options['hoistedNoteId'];
});
async function getHoistedNoteId() {
await optionsInit.optionsReady;
return hoistedNoteId;
}
async function setHoistedNoteId(noteId) {
hoistedNoteId = noteId;
await server.put('options/hoistedNoteId/' + noteId);
}
export default {
getHoistedNoteId,
setHoistedNoteId
}

View File

@@ -4,13 +4,18 @@ import Branch from "../entities/branch.js";
import server from "./server.js";
import treeCache from "./tree_cache.js";
import messagingService from "./messaging.js";
import hoistedNoteService from "./hoisted_note.js";
async function prepareTree(noteRows, branchRows, relations) {
utils.assertArguments(noteRows, branchRows, relations);
treeCache.load(noteRows, branchRows, relations);
return [ await prepareNode(await treeCache.getBranch('root')) ];
const hoistedNoteId = await hoistedNoteService.getHoistedNoteId();
const hoistedNote = await treeCache.getNote(hoistedNoteId);
const hoistedBranch = (await hoistedNote.getBranches())[0];
return [ await prepareNode(hoistedBranch) ];
}
async function prepareBranch(note) {

View File

@@ -10,7 +10,7 @@ import exportDialog from '../dialogs/export.js';
import infoService from "./info.js";
import treeCache from "./tree_cache.js";
import syncService from "./sync.js";
import contextMenuService from "./context_menu.js";
import hoistedNoteService from './hoisted_note.js';
const $tree = $("#tree");
@@ -83,6 +83,8 @@ const contextMenuItems = [
{title: "Insert child note <kbd>Ctrl+P</kbd>", cmd: "insertChildNote", uiIcon: "plus"},
{title: "Delete", cmd: "delete", uiIcon: "trash"},
{title: "----"},
{title: "Hoist note", cmd: "hoist", uiIcon: "arrow-up"},
{title: "Unhoist note", cmd: "unhoist", uiIcon: "arrow-up"},
{title: "Edit branch prefix <kbd>F2</kbd>", cmd: "editBranchPrefix", uiIcon: "pencil"},
{title: "----"},
{title: "Protect subtree", cmd: "protectSubtree", uiIcon: "shield-check"},
@@ -101,6 +103,16 @@ const contextMenuItems = [
{title: "Sort alphabetically <kbd>Alt+S</kbd>", cmd: "sortAlphabetically", uiIcon: "arrows-v"}
];
function hideItem(cmd, hidden) {
const item = contextMenuItems.find(item => item.cmd === cmd);
if (!item) {
throw new Error(`Command ${cmd} has not been found!`);
}
item.hidden = hidden;
}
function enableItem(cmd, enabled) {
const item = contextMenuItems.find(item => item.cmd === cmd);
@@ -130,6 +142,11 @@ async function getContextMenuItems(event) {
enableItem("export", note.type !== 'search');
enableItem("editBranchPrefix", isNotRoot && parentNote.type !== 'search');
const hoistedNoteId = await hoistedNoteService.getHoistedNoteId();
hideItem("hoist", note.noteId === hoistedNoteId);
hideItem("unhoist", note.noteId !== hoistedNoteId || !isNotRoot);
// Activate node on right-click
node.setActive();
@@ -194,6 +211,12 @@ function selectContextMenuItem(event, cmd) {
else if (cmd === "sortAlphabetically") {
treeService.sortAlphabetically(node.data.noteId);
}
else if (cmd === "hoist") {
hoistedNoteService.setHoistedNoteId(node.data.noteId);
}
else if (cmd === "unhoist") {
hoistedNoteService.setHoistedNoteId('root');
}
else {
messagingService.logError("Unknown command: " + cmd);
}