From 2b5e9bb226b011dffe03d4961c3f5b53034e9397 Mon Sep 17 00:00:00 2001 From: hackademix Date: Sun, 31 May 2020 18:13:14 +0200 Subject: [PATCH] Fixed first capability checkbox accidentally "clicked" when opening CUSTOM by space bar. --- src/ui/ui.js | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/src/ui/ui.js b/src/ui/ui.js index b363485..99992ad 100644 --- a/src/ui/ui.js +++ b/src/ui/ui.js @@ -548,6 +548,20 @@ var UI = (() => { debug("Wiring", root); if (!root.wiredBy) { root.addEventListener("keydown", e => this._keyNavHandler(e), true); + root.addEventListener("keyup", e => { + // we use a keyup listener to open the customizer from other presets + // because space repetion may lead to unintendedly "click" on the + // first cap checkbox once focused from keydown + switch(e.code) { + case "Space": { + let focused = document.activeElement; + if (focused.matches("tr .preset")) { + focused.closest("tr").querySelector(".preset[value='CUSTOM']").click(); + e.preventDefault(); + } + } + } + }, true); root.addEventListener("click", this, true); root.addEventListener("change", this, true); root.wiredBy = this; @@ -590,11 +604,8 @@ var UI = (() => { case "Space": if (focused.matches(".full-address")) { UI.openSiteInfo(row.domain); - } else if (focused.matches(".preset")) { + } else { if (e.code === "Enter") return; // let the popup handle closure - let custom = row.querySelector(".preset[value='CUSTOM']"); - custom.focus(); - custom.click(); } break; case "Home":