zadam/trilium
1
1
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2024-09-22 00:26:01 +08:00
Code Issues 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,
addButtonToToolbar,
activateNote,
getInstanceName: treeService.getInstanceName,
getInstanceName: () => window.glob.instanceName,
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 $scrollToCurrentNoteButton = $("#scroll-to-current-note-button");
let instanceName = null; // should have better place
let startNotePath = null;
async function getNoteTitle(noteId, parentNoteId = null) {
@ -656,7 +654,7 @@ function getNotePathFromAddress() {
async function loadTree() {
const resp = await server.get('tree');
startNotePath = resp.start_note_path;
instanceName = resp.instanceName;
window.glob.instanceName = resp.instanceName;
if (document.location.hash) {
startNotePath = getNotePathFromAddress();
@ -838,10 +836,6 @@ async function sortAlphabetically(noteId) {
await reload();
}
function getInstanceName() {
return instanceName;
}
messagingService.subscribeToMessages(syncData => {
if (syncData.some(sync => sync.entityName === 'branches')
|| syncData.some(sync => sync.entityName === 'notes')) {
@ -909,6 +903,5 @@ export default {
removeParentChildRelation,
setParentChildRelation,
getSelectedNodes,
sortAlphabetically,
getInstanceName
sortAlphabetically
};