From 53875d26bc1250c9dc0c1f73fa4c8327504b18d1 Mon Sep 17 00:00:00 2001 From: zadam Date: Wed, 13 Oct 2021 23:27:58 +0200 Subject: [PATCH] don't try to activate the pane being currently removed --- src/public/app/widgets/buttons/button_widget.js | 6 +++--- src/public/app/widgets/buttons/close_pane_button.js | 8 +++++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/public/app/widgets/buttons/button_widget.js b/src/public/app/widgets/buttons/button_widget.js index 47db23c3f..0740aeca8 100644 --- a/src/public/app/widgets/buttons/button_widget.js +++ b/src/public/app/widgets/buttons/button_widget.js @@ -26,16 +26,16 @@ export default class ButtonWidget extends NoteContextAwareWidget { this.$widget = $(TPL); if (this.settings.onClick) { - this.$widget.on("click", () => { + this.$widget.on("click", e => { this.$widget.tooltip("hide"); - this.settings.onClick(this) + this.settings.onClick(this, e); }); } else { this.$widget.on("click", () => { this.$widget.tooltip("hide"); - this.triggerCommand(this.settings.command) + this.triggerCommand(this.settings.command); }); } diff --git a/src/public/app/widgets/buttons/close_pane_button.js b/src/public/app/widgets/buttons/close_pane_button.js index bbc972a13..2fc5d52c8 100644 --- a/src/public/app/widgets/buttons/close_pane_button.js +++ b/src/public/app/widgets/buttons/close_pane_button.js @@ -13,6 +13,12 @@ export default class ClosePaneButton extends ButtonWidget { this.icon("bx-x") .title("Close this pane") .titlePlacement("bottom") - .onClick(widget => widget.triggerCommand("closeThisNoteSplit", { ntxId: widget.getNtxId() })); + .onClick((widget, e) => { + // to avoid split pane container detecting click within the pane which would try to activate this + // pane (which is being removed) + e.stopPropagation(); + + widget.triggerCommand("closeThisNoteSplit", { ntxId: widget.getNtxId() }); + }); } }