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

frontend sync fixes

Browse Source
This commit is contained in:
zadam 2020-02-09 21:53:10 +01:00
parent 826c434630
commit 99ea238c3f
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/public/javascripts/services/ws.js
View File

@ -201,7 +201,7 @@ subscribeToMessages(message => {
}); });
async function processSyncRows(syncRows) { async function processSyncRows(syncRows) {
const loadResults = new LoadResults(this); const loadResults = new LoadResults(treeCache);
syncRows.filter(sync => sync.entityName === 'notes').forEach(sync => { syncRows.filter(sync => sync.entityName === 'notes').forEach(sync => {
const note = treeCache.notes[sync.entityId]; const note = treeCache.notes[sync.entityId];
@ -244,7 +244,7 @@ async function processSyncRows(syncRows) {
} }
else if (!sync.entity.isDeleted) { else if (!sync.entity.isDeleted) {
if (childNote || parentNote) { if (childNote || parentNote) {
branch = new Branch(this, sync.entity); branch = new Branch(treeCache, sync.entity);
treeCache.branches[branch.branchId] = branch; treeCache.branches[branch.branchId] = branch;
loadResults.addBranch(sync.entityId, sync.sourceId); loadResults.addBranch(sync.entityId, sync.sourceId);
@ -294,7 +294,7 @@ async function processSyncRows(syncRows) {
} }
else if (!sync.entity.isDeleted) { else if (!sync.entity.isDeleted) {
if (sourceNote || targetNote) { if (sourceNote || targetNote) {
attribute = new Attribute(this, sync.entity); attribute = new Attribute(treeCache, sync.entity);
treeCache.attributes[attribute.attributeId] = attribute; treeCache.attributes[attribute.attributeId] = attribute;

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

@ -404,7 +404,7 @@ export default class NoteTreeWidget extends TabAwareWidget {
await this.tree.reload(notes); await this.tree.reload(notes);
} }
createTopLevelNoteListener() { treeService.createNewTopLevelNote(); } createTopLevelNoteListener() { noteCreateService.createNewTopLevelNote(); }
collapseTreeListener() { this.collapseTree(); } collapseTreeListener() { this.collapseTree(); }

4
src/public/javascripts/widgets/tab_caching_widget.js
View File

@ -45,7 +45,7 @@ export default class TabCachingWidget extends TabAwareWidget {
widget.eventReceived('setTabContext', {tabContext: this.tabContext}); widget.eventReceived('setTabContext', {tabContext: this.tabContext});
} }
widget.toggle(true); widget.toggle(widget.isEnabled());
} }
tabRemovedListener({tabId}) { tabRemovedListener({tabId}) {
@ -63,7 +63,7 @@ export default class TabCachingWidget extends TabAwareWidget {
for (const tabId in this.widgets) { for (const tabId in this.widgets) {
this.widgets[tabId].toggle( this.widgets[tabId].toggle(
show show
&& this.tabContext && tabId === this.tabContext.tabId && this.isTab(tabId)
&& this.widgets[tabId].isEnabled()); && this.widgets[tabId].isEnabled());
} }
} }