From 5809d55fac7acb8ab7b726fa0582461da0d50de7 Mon Sep 17 00:00:00 2001 From: Miodec Date: Sat, 4 Mar 2023 16:40:12 +0100 Subject: [PATCH] allowing escape to close the mini result graph popup --- frontend/src/ts/account/mini-result-chart.ts | 10 ++++++++++ frontend/src/ts/commandline/index.ts | 5 ++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/frontend/src/ts/account/mini-result-chart.ts b/frontend/src/ts/account/mini-result-chart.ts index 808363190..1208ca88c 100644 --- a/frontend/src/ts/account/mini-result-chart.ts +++ b/frontend/src/ts/account/mini-result-chart.ts @@ -61,6 +61,16 @@ export function updateData(data: MonkeyTypes.ChartData): void { ChartController.miniResult.updateColors(); } +$(document).on("keydown", (event) => { + if ( + event.key === "Escape" && + Misc.isElementVisible(".pageAccount .miniResultChartWrapper") + ) { + hide(); + event.preventDefault(); + } +}); + $(".pageAccount").on("click", ".miniResultChartBg", () => { hide(); }); diff --git a/frontend/src/ts/commandline/index.ts b/frontend/src/ts/commandline/index.ts index bf01fff3a..2b07462e9 100644 --- a/frontend/src/ts/commandline/index.ts +++ b/frontend/src/ts/commandline/index.ts @@ -485,8 +485,11 @@ $(document).ready(() => { event.shiftKey) ) { const popupVisible = isAnyPopupVisible(); + const miniResultPopupVisible = isElementVisible( + ".pageAccount .miniResultChartWrapper" + ); - if (popupVisible) return; + if (popupVisible || miniResultPopupVisible) return; if (Config.quickRestart === "esc" && ActivePage.get() === "login") return; event.preventDefault();