diff --git a/src/public/javascripts/services/date_notes.js b/src/public/javascripts/services/date_notes.js index 9c5429dbb..34e76105e 100644 --- a/src/public/javascripts/services/date_notes.js +++ b/src/public/javascripts/services/date_notes.js @@ -8,27 +8,21 @@ async function getTodayNote() { /** @return {NoteShort} */ async function getDateNote(date) { - const note = await server.get('date-notes/date/' + date); - - await treeCache.reloadNotes([note.noteId]); + const note = await server.get('date-notes/date/' + date, {'trilium-source-id': "date-note"}); return await treeCache.getNote(note.noteId); } /** @return {NoteShort} */ async function getMonthNote(month) { - const note = await server.get('date-notes/month/' + month); - - await treeCache.reloadNotes([note.noteId]); + const note = await server.get('date-notes/month/' + month, {'trilium-source-id': "date-note"}); return await treeCache.getNote(note.noteId); } /** @return {NoteShort} */ async function getYearNote(year) { - const note = await server.get('date-notes/year/' + year); - - await treeCache.reloadNotes([note.noteId]); + const note = await server.get('date-notes/year/' + year, {'trilium-source-id': "date-note"}); return await treeCache.getNote(note.noteId); } diff --git a/src/public/javascripts/services/server.js b/src/public/javascripts/services/server.js index c229c1feb..721bb3849 100644 --- a/src/public/javascripts/services/server.js +++ b/src/public/javascripts/services/server.js @@ -64,15 +64,15 @@ async function call(method, url, data, headers = {}) { }); } else { - return await ajax(url, method, data); + return await ajax(url, method, data, headers); } } -async function ajax(url, method, data) { +async function ajax(url, method, data, headers) { const options = { url: baseApiUrl + url, type: method, - headers: getHeaders(), + headers: getHeaders(headers), timeout: 60000 }; diff --git a/src/public/javascripts/services/tree_cache.js b/src/public/javascripts/services/tree_cache.js index 8371c2291..256ad4784 100644 --- a/src/public/javascripts/services/tree_cache.js +++ b/src/public/javascripts/services/tree_cache.js @@ -55,8 +55,6 @@ class TreeCache { if (childNote) { childNote.parents = childNote.parents.filter(p => p !== noteId); - console.log("Cleaning up", childNote.parentToBranch[noteId]); - delete this.branches[childNote.parentToBranch[noteId]]; delete childNote.parentToBranch[noteId]; } @@ -75,10 +73,6 @@ class TreeCache { } for (const branch of branchesByNotes[noteId] || []) { // can be empty for deleted notes - if (noteId === '2Ndfjyv3EbEQ') { - console.log("Adding", branch.branchId); - } - this.branches[branch.branchId] = branch; } diff --git a/src/services/sync.js b/src/services/sync.js index 0c9f4677c..3dc8fe2da 100644 --- a/src/services/sync.js +++ b/src/services/sync.js @@ -14,6 +14,7 @@ const syncOptions = require('./sync_options'); const syncMutexService = require('./sync_mutex'); const cls = require('./cls'); const request = require('./request'); +const ws = require('./ws'); let proxyToggle = true;