From a35405500ef11305ac9fb51a33b4948a19f11eaf Mon Sep 17 00:00:00 2001
From: tophf <tophf@gmx.com>
Date: Sat, 25 Dec 2021 21:53:15 +0300
Subject: [PATCH] generalize can-close-on-esc

---
 edit.html    | 8 ++++----
 edit/util.js | 6 ++++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/edit.html b/edit.html
index aaff56d3..71c97766 100644
--- a/edit.html
+++ b/edit.html
@@ -214,11 +214,11 @@
     </template>
 
     <template data-id="keymapHelp">
-      <table class="keymap-list">
+      <table class="keymap-list can-close-on-esc">
         <thead>
           <tr>
-            <th><input i18n-placeholder="helpKeyMapHotkey" type="search" class="can-close-on-esc"></th>
-            <th><input i18n-placeholder="helpKeyMapCommand" type="search" class="can-close-on-esc" spellcheck="false"></th>
+            <th><input i18n-placeholder="helpKeyMapHotkey" type="search"></th>
+            <th><input i18n-placeholder="helpKeyMapCommand" type="search"></th>
           </tr>
         </thead>
         <tbody>
@@ -231,7 +231,7 @@
     </template>
 
     <template data-id="styleSettings">
-      <fieldset class="style-settings" disabled>
+      <fieldset class="style-settings can-close-on-esc">
         <!-- <label class="style-origin">
           <span class="form-label" i18n-text="styleOriginLabel"></span>
           <input id="styleOrigin" type="text">
diff --git a/edit/util.js b/edit/util.js
index 028da6c1..7035ab9e 100644
--- a/edit/util.js
+++ b/edit/util.js
@@ -31,8 +31,10 @@ const helpPopup = {
         getEventKeyName(event) === 'Escape' &&
         !$('.CodeMirror-hints, #message-box') && (
           !document.activeElement ||
-          !document.activeElement.closest('#search-replace-dialog') &&
-          document.activeElement.matches(':not(input), .can-close-on-esc')
+          !document.activeElement.closest('#search-replace-dialog') && (
+            document.activeElement.tagName !== 'INPUT' ||
+            document.activeElement.closest('.can-close-on-esc')
+          )
         )
       );
     const div = $('#help-popup');