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

fix(touchbar): errors if there is no modal

Browse Source
This commit is contained in:
Elian Doran
2025-04-13 22:10:41 +03:00
parent d6478c2fed
commit 3fb2378de9
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/public/app/widgets/touch_bar.ts
View File

@@ -15,7 +15,7 @@ export default class TouchBarWidget extends NoteContextAwareWidget {
nativeImage: typeof import("electron").nativeImage;
remote: typeof import("@electron/remote");
lastFocusedComponent?: Component;
private $activeModal: JQuery<HTMLElement>;
private $activeModal?: JQuery<HTMLElement>;
constructor() {
super();
@@ -57,7 +57,7 @@ export default class TouchBarWidget extends NoteContextAwareWidget {
const parentComponent = this.lastFocusedComponent;
let touchBar = null;
if (this.$activeModal.length > 0) {
if (this.$activeModal?.length) {
touchBar = this.#buildModalTouchBar();
} else if (parentComponent) {
const items = parentComponent.triggerCommand("buildTouchBar", {
@@ -78,16 +78,16 @@ export default class TouchBarWidget extends NoteContextAwareWidget {
const items: TouchBarItem[] = [];
// Look for the modal title.
const $title = this.$activeModal.find(".modal-title");
if ($title.length > 0) {
const $title = this.$activeModal?.find(".modal-title");
if ($title?.length) {
items.push(new TouchBarLabel({ label: $title.text() }))
}
items.push(new TouchBarSpacer({ size: "flexible" }));
// Look for buttons in the modal.
const $buttons = this.$activeModal.find(".modal-footer button");
for (const button of $buttons) {
const $buttons = this.$activeModal?.find(".modal-footer button");
for (const button of $buttons ?? []) {
items.push(new TouchBarButton({
label: button.innerText,
click: () => button.click(),