simplify regexpTester::isShown

edit/regexp-tester.js

@@ -4,7 +4,7 @@
 
 define(require => {
   const {URLS, openURL, tryRegExp} = require('/js/toolbox');
-  const {$, $create} = require('/js/dom');
+  const {$create} = require('/js/dom');
   const t = require('/js/localization');
   const {helpPopup} = require('./util');
 
@@ -12,27 +12,28 @@ define(require => {
   const OWN_ICON = chrome.runtime.getManifest().icons['16'];
   const cachedRegexps = new Map();
   let currentRegexps = [];
-  let isWatching;
-
-  const isShown = () => Boolean($('.regexp-report'));
+  let isWatching = false;
+  let isShown = false;
 
   const regexpTester = /** @namespace RegExpTester */{
 
-    toggle(state = !isShown()) {
-      if (state && !isShown()) {
+    toggle(state = !isShown) {
+      if (state && !isShown) {
         if (!isWatching) {
           isWatching = true;
           chrome.tabs.onUpdated.addListener(onTabUpdate);
         }
         helpPopup.show('', $create('.regexp-report'));
-      } else if (!state && isShown()) {
+        isShown = true;
+      } else if (!state && isShown) {
         unwatch();
         helpPopup.close();
+        isShown = false;
       }
     },
 
     async update(newRegexps) {
-      if (!isShown()) {
+      if (!isShown) {
         unwatch();
         return;
       }
@@ -188,5 +189,7 @@ define(require => {
     }
   }
 
+  window.on('closeHelp', () => regexpTester.toggle(false));
+
   return regexpTester;
 });

edit/util.js

@@ -94,10 +94,10 @@ define(require => {
               document.activeElement.matches(':not(input), .can-close-on-esc')
             )
           );
-        if (!canClose) {
+        const div = $('#help-popup');
+        if (!canClose || !div) {
           return;
         }
-        const div = $('#help-popup');
         if (event && div.codebox && !div.codebox.options.readOnly && !div.codebox.isClean()) {
           setTimeout(async () => {
             const ok = await messageBoxProxy.confirm(t('confirmDiscardChanges'));