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

merged tree utils into tree service

Browse Source
This commit is contained in:
zadam
2020-01-25 09:56:08 +01:00
parent 7a62d1636b
commit 3254b551d8
22 changed files with 168 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/public/javascripts/widgets/note_paths.js
View File

@@ -1,6 +1,5 @@
import TabAwareWidget from "./tab_aware_widget.js";
import treeService from "../services/tree.js";
import treeUtils from "../services/tree_utils.js";
import linkService from "../services/link.js";
const TPL = `
@@ -71,7 +70,7 @@ export default class NotePathsWidget extends TabAwareWidget {
}
async addPath(notePath, isCurrent) {
const title = await treeUtils.getNotePathTitle(notePath);
const title = await treeService.getNotePathTitle(notePath);
const noteLink = await linkService.createNoteLink(notePath, {title});

12
src/public/javascripts/widgets/note_tree.js
View File

@@ -1,8 +1,6 @@
import hoistedNoteService from "../services/hoisted_note.js";
import searchNotesService from "../services/search_notes.js";
import treeService from "../services/tree.js";
import treeUtils from "../services/tree_utils.js";
import noteDetailService from "../services/note_detail.js";
import utils from "../services/utils.js";
import contextMenuWidget from "../services/context_menu.js";
import treeKeyBindingService from "../services/tree_keybindings.js";
@@ -51,7 +49,7 @@ export default class NoteTreeWidget extends TabAwareWidget {
if (e.which === 2) {
const node = $.ui.fancytree.getNode(e);
treeUtils.getNotePath(node).then(notePath => {
treeService.getNotePath(node).then(notePath => {
if (notePath) {
const tabContext = appContext.openEmptyTab();
tabContext.setNote(notePath);
@@ -89,7 +87,7 @@ export default class NoteTreeWidget extends TabAwareWidget {
}
else if (event.ctrlKey) {
const tabContext = appContext.openEmptyTab();
treeUtils.getNotePath(node).then(notePath => tabContext.setNote(notePath));
treeService.getNotePath(node).then(notePath => tabContext.setNote(notePath));
appContext.activateTab(tabContext.tabId);
}
else {
@@ -105,7 +103,7 @@ export default class NoteTreeWidget extends TabAwareWidget {
// click event won't propagate so let's close context menu manually
contextMenuWidget.hideContextMenu();
const notePath = await treeUtils.getNotePath(data.node);
const notePath = await treeService.getNotePath(data.node);
const activeTabContext = this.appContext.getActiveTabContext();
await activeTabContext.setNote(notePath);
@@ -463,7 +461,7 @@ export default class NoteTreeWidget extends TabAwareWidget {
async createNoteAfterListener() {
const node = this.getActiveNode();
const parentNoteId = node.data.parentNoteId;
const isProtected = await treeUtils.getParentProtectedStatus(node);
const isProtected = await treeService.getParentProtectedStatus(node);
if (node.data.noteId === 'root' || node.data.noteId === await hoistedNoteService.getHoistedNoteId()) {
return;
@@ -524,7 +522,7 @@ export default class NoteTreeWidget extends TabAwareWidget {
const activeNode = this.getActiveNode();
const activeNotePath = activeNode !== null ? await treeUtils.getNotePath(activeNode) : null;
const activeNotePath = activeNode !== null ? await treeService.getNotePath(activeNode) : null;
await this.reload(notes);

6
src/public/javascripts/widgets/promoted_attributes.js
View File

@@ -1,6 +1,6 @@
import server from "../services/server.js";
import ws from "../services/ws.js";
import treeUtils from "../services/tree_utils.js";
import treeService from "../services/tree.js";
import noteAutocompleteService from "../services/note_autocomplete.js";
import TabAwareWidget from "./tab_aware_widget.js";
@@ -185,7 +185,7 @@ export default class PromotedAttributesWidget extends TabAwareWidget {
}
else if (valueAttr.type === 'relation') {
if (valueAttr.value) {
$input.val(await treeUtils.getNoteTitle(valueAttr.value));
$input.val(await treeService.getNoteTitle(valueAttr.value));
}
// no need to wait for this
@@ -247,7 +247,7 @@ export default class PromotedAttributesWidget extends TabAwareWidget {
else if ($attr.prop("attribute-type") === "relation") {
const selectedPath = $attr.getSelectedPath();
value = selectedPath ? treeUtils.getNoteIdFromNotePath(selectedPath) : "";
value = selectedPath ? treeService.getNoteIdFromNotePath(selectedPath) : "";
}
else {
value = $attr.val();