Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 10:26:08 +01:00
Code Issues Packages Projects Releases Activity

fix duplicated cached widgets

Browse Source
This commit is contained in:
zadam
2020-02-08 17:44:34 +01:00
parent 81f4966a1a
commit 60d07a6871
3 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
electron.js
View File

@@ -44,6 +44,7 @@ app.on('will-quit', () => {
globalShortcut.unregisterAll(); globalShortcut.unregisterAll();
}); });
// this is to disable electron warning spam in the dev console (local development only)
process.env['ELECTRON_DISABLE_SECURITY_WARNINGS'] = 'true'; process.env['ELECTRON_DISABLE_SECURITY_WARNINGS'] = 'true';
require('./src/www'); require('./src/www');

6
src/public/javascripts/widgets/calendar.js
View File

@@ -38,12 +38,6 @@ export default class CalendarWidget extends CollapsibleWidget {
console.log("set tab context", tabContext.tabId, "to", this.componentId); console.log("set tab context", tabContext.tabId, "to", this.componentId);
} }
async refresh() {
super.refresh();
//console.trace("tab", this.tabContext.tabId);
}
async doRenderBody() { async doRenderBody() {
await libraryLoader.requireLibrary(libraryLoader.CALENDAR_WIDGET); await libraryLoader.requireLibrary(libraryLoader.CALENDAR_WIDGET);

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

@@ -13,6 +13,14 @@ export default class TabCachingWidget extends TabAwareWidget {
return this.$widget; return this.$widget;
} }
activeTabChangedListener(param) {
super.activeTabChangedListener(param);
// stop propagation of the event to the children, individual tab widget should not know about tab switching
// since they are per-tab
return false;
}
refreshWithNote() { refreshWithNote() {
for (const widget of Object.values(this.widgets)) { for (const widget of Object.values(this.widgets)) {
widget.toggle(false); widget.toggle(false);
@@ -28,17 +36,13 @@ export default class TabCachingWidget extends TabAwareWidget {
if (!widget) { if (!widget) {
widget = this.widgets[this.tabContext.tabId] = this.widgetFactory(); widget = this.widgets[this.tabContext.tabId] = this.widgetFactory();
this.children.push(widget); this.children.push(widget);console.log("Creating widget",widget.componentId,"for", this.tabContext.tabId);
this.$widget.after(widget.render()); this.$widget.after(widget.render());
widget.eventReceived('setTabContext', {tabContext: this.tabContext}); widget.eventReceived('setTabContext', {tabContext: this.tabContext});
} }
widget.toggle(true); widget.toggle(true);
// stop propagation of the event to the children, individual tab widget should not know about tab switching
// since they are per-tab
return false;
} }
tabRemovedListener({tabId}) { tabRemovedListener({tabId}) {