diff --git a/src/public/javascripts/services/tab_context.js b/src/public/javascripts/services/tab_context.js index e65eabb12..d81a2a4ea 100644 --- a/src/public/javascripts/services/tab_context.js +++ b/src/public/javascripts/services/tab_context.js @@ -112,20 +112,6 @@ class TabContext extends Component { }); } } - - // FIXME - async _setTitleBar() { - document.title = "Trilium Notes"; - - const activeTabContext = this.getActiveTabContext(); - - if (activeTabContext && activeTabContext.notePath) { - const note = await treeCache.getNote(treeService.getNoteIdFromNotePath(activeTabContext.notePath)); - - // it helps navigating in history if note title is included in the title - document.title += " - " + note.title; - } - } } export default TabContext; \ No newline at end of file diff --git a/src/public/javascripts/widgets/basic_widget.js b/src/public/javascripts/widgets/basic_widget.js index adf78081e..006fc6a73 100644 --- a/src/public/javascripts/widgets/basic_widget.js +++ b/src/public/javascripts/widgets/basic_widget.js @@ -13,9 +13,15 @@ class BasicWidget extends Component { this.appContext.trigger(eventName); }); + this.toggle(this.isEnabled()); + return $widget; } + isEnabled() { + return true; + } + /** * for overriding */ diff --git a/src/public/javascripts/widgets/calendar.js b/src/public/javascripts/widgets/calendar.js index bade437fe..b03b48455 100644 --- a/src/public/javascripts/widgets/calendar.js +++ b/src/public/javascripts/widgets/calendar.js @@ -27,8 +27,8 @@ const TPL = ` export default class CalendarWidget extends CollapsibleWidget { getWidgetTitle() { return "Calendar"; } - async isEnabled() { - return await super.isEnabled() + isEnabled() { + return super.isEnabled() && this.note.hasOwnedLabel("dateNote"); } diff --git a/src/public/javascripts/widgets/edited_notes.js b/src/public/javascripts/widgets/edited_notes.js index 9d243d39a..4db1b421d 100644 --- a/src/public/javascripts/widgets/edited_notes.js +++ b/src/public/javascripts/widgets/edited_notes.js @@ -14,9 +14,9 @@ export default class EditedNotesWidget extends CollapsibleWidget { getMaxHeight() { return "200px"; } - async isEnabled() { - return await super.isEnabled() - && await this.note.hasOwnedLabel("dateNote"); + isEnabled() { + return super.isEnabled() + && this.note.hasOwnedLabel("dateNote"); } async refreshWithNote(note) { diff --git a/src/public/javascripts/widgets/flex_container.js b/src/public/javascripts/widgets/flex_container.js index ae7f1f4d4..338787863 100644 --- a/src/public/javascripts/widgets/flex_container.js +++ b/src/public/javascripts/widgets/flex_container.js @@ -8,7 +8,7 @@ export default class FlexContainer extends BasicWidget { this.children = widgets; } - render() { + doRender() { this.$widget = $(`