gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

got rid of instanceName in tree service

Browse Source
This commit is contained in:
azivner 2018-03-25 22:56:23 -04:00
parent 91ee90d827
commit cdf94181d2
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/public/javascripts/services/script_api.js
View File

@ -51,7 +51,7 @@ function ScriptApi(startNote, currentNote) {
currentNote: currentNote, currentNote: currentNote,
addButtonToToolbar, addButtonToToolbar,
activateNote, activateNote,
getInstanceName: treeService.getInstanceName, getInstanceName: () => window.glob.instanceName,
runOnServer runOnServer
} }
} }

11
src/public/javascripts/services/tree.js
View File

@ -20,8 +20,6 @@ const $createTopLevelNoteButton = $("#create-top-level-note-button");
const $collapseTreeButton = $("#collapse-tree-button"); const $collapseTreeButton = $("#collapse-tree-button");
const $scrollToCurrentNoteButton = $("#scroll-to-current-note-button"); const $scrollToCurrentNoteButton = $("#scroll-to-current-note-button");
let instanceName = null; // should have better place
let startNotePath = null; let startNotePath = null;
async function getNoteTitle(noteId, parentNoteId = null) { async function getNoteTitle(noteId, parentNoteId = null) {
@ -656,7 +654,7 @@ function getNotePathFromAddress() {
async function loadTree() { async function loadTree() {
const resp = await server.get('tree'); const resp = await server.get('tree');
startNotePath = resp.start_note_path; startNotePath = resp.start_note_path;
instanceName = resp.instanceName; window.glob.instanceName = resp.instanceName;
if (document.location.hash) { if (document.location.hash) {
startNotePath = getNotePathFromAddress(); startNotePath = getNotePathFromAddress();
@ -838,10 +836,6 @@ async function sortAlphabetically(noteId) {
await reload(); await reload();
} }
function getInstanceName() {
return instanceName;
}
messagingService.subscribeToMessages(syncData => { messagingService.subscribeToMessages(syncData => {
if (syncData.some(sync => sync.entityName === 'branches') if (syncData.some(sync => sync.entityName === 'branches')
|| syncData.some(sync => sync.entityName === 'notes')) { || syncData.some(sync => sync.entityName === 'notes')) {
@ -909,6 +903,5 @@ export default {
removeParentChildRelation, removeParentChildRelation,
setParentChildRelation, setParentChildRelation,
getSelectedNodes, getSelectedNodes,
sortAlphabetically, sortAlphabetically
getInstanceName
}; };