gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 18:08:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

make initialization of launchers more robust

Browse Source
This commit is contained in:
zadam 2022-12-24 14:42:35 +01:00
parent 4c51588270
commit e2b227df34
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/public/app/widgets/containers/launcher_container.js
View File

@ -17,8 +17,6 @@ export default class LauncherContainer extends FlexContainer {
async load() { async load() {
await froca.initializedPromise; await froca.initializedPromise;
this.children = [];
const visibleLaunchersRoot = await froca.getNote('_lbVisibleLaunchers', true); const visibleLaunchersRoot = await froca.getNote('_lbVisibleLaunchers', true);
if (!visibleLaunchersRoot) { if (!visibleLaunchersRoot) {
@ -27,13 +25,15 @@ export default class LauncherContainer extends FlexContainer {
return; return;
} }
const newChildren = [];
for (const launcherNote of await visibleLaunchersRoot.getChildNotes()) { for (const launcherNote of await visibleLaunchersRoot.getChildNotes()) {
try { try {
const launcherWidget = new LauncherWidget(); const launcherWidget = new LauncherWidget();
const success = await launcherWidget.initLauncher(launcherNote); const success = await launcherWidget.initLauncher(launcherNote);
if (success) { if (success) {
this.child(launcherWidget); newChildren.push(launcherWidget);
} }
} }
catch (e) { catch (e) {
@ -41,6 +41,9 @@ export default class LauncherContainer extends FlexContainer {
} }
} }
this.children = [];
this.child(...newChildren);
this.$widget.empty(); this.$widget.empty();
this.renderChildren(); this.renderChildren();

5
src/public/app/widgets/sync_status.js
View File

@ -78,8 +78,6 @@ export default class SyncStatusWidget extends BasicWidget {
constructor() { constructor() {
super(); super();
ws.subscribeToMessages(message => this.processMessage(message));
this.syncState = 'unknown'; this.syncState = 'unknown';
this.allChangesPushed = false; this.allChangesPushed = false;
} }
@ -93,8 +91,9 @@ export default class SyncStatusWidget extends BasicWidget {
}); });
this.$widget.find('.sync-status-icon:not(.sync-status-in-progress)') this.$widget.find('.sync-status-icon:not(.sync-status-in-progress)')
.on('click', () => syncService.syncNow()) .on('click', () => syncService.syncNow());
ws.subscribeToMessages(message => this.processMessage(message));
} }
showIcon(className) { showIcon(className) {