From 25af532ab7750a456f46b37825d8dbe876363d19 Mon Sep 17 00:00:00 2001
From: siikamiika <siikamiika@users.noreply.github.com>
Date: Sat, 9 Nov 2019 12:27:09 +0200
Subject: enable expression scan toggling on search page

---
 ext/fg/js/popup-nested.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ext/fg/js/popup-nested.js')

diff --git a/ext/fg/js/popup-nested.js b/ext/fg/js/popup-nested.js
index cec95aea..1b5ab8f7 100644
--- a/ext/fg/js/popup-nested.js
+++ b/ext/fg/js/popup-nested.js
@@ -33,7 +33,7 @@ async function popupNestedInitialize(id, depth, parentFrameId, url) {
         return;
     }
 
-    const ignoreNodes = options.scanning.enableOnPopupExpressions ? [] : [ '.expression', '.expression *' ];
+    const ignoreNodes = options.scanning.enableOnPopupExpressions ? [] : ['.expression-scan-toggle', '.expression-scan-toggle *'];
 
     window.frontendInitializationData = {id, depth, parentFrameId, ignoreNodes, url, proxy: true};
 
-- 
cgit v1.2.3


From 40c8268fd6b32c9918fbebd374723cd17f2e19aa Mon Sep 17 00:00:00 2001
From: siikamiika <siikamiika@users.noreply.github.com>
Date: Sat, 9 Nov 2019 13:01:21 +0200
Subject: always disable scanning IME checkbox label

---
 ext/bg/js/search-frontend.js | 5 ++++-
 ext/bg/search.html           | 2 +-
 ext/fg/js/popup-nested.js    | 5 ++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'ext/fg/js/popup-nested.js')

diff --git a/ext/bg/js/search-frontend.js b/ext/bg/js/search-frontend.js
index 63ed0724..6ba8467e 100644
--- a/ext/bg/js/search-frontend.js
+++ b/ext/bg/js/search-frontend.js
@@ -25,7 +25,10 @@ async function searchFrontendSetup() {
     const options = await apiOptionsGet(optionsContext);
     if (!options.scanning.enableOnSearchPage) { return; }
 
-    const ignoreNodes = options.scanning.enableOnPopupExpressions ? [] : ['.expression-scan-toggle', '.expression-scan-toggle *'];
+    const ignoreNodes = ['.scan-disable', '.scan-disable *'];
+    if (!options.scanning.enableOnPopupExpressions) {
+        ignoreNodes.push('.expression-scan-toggle', '.expression-scan-toggle *');
+    }
 
     window.frontendInitializationData = {depth: 1, ignoreNodes, proxy: false};
 
diff --git a/ext/bg/search.html b/ext/bg/search.html
index 91140b95..c7f97712 100644
--- a/ext/bg/search.html
+++ b/ext/bg/search.html
@@ -27,7 +27,7 @@
 
             <div class="input-group" style="padding-top: 10px; font-size: 20px; user-select: none;">
                 <span title="Enable kana input method" class="input-group-text">
-                    <label>
+                    <label class="scan-disable">
                         あ
                         <input type="checkbox" id="wanakana-enable" />
                     </label>
diff --git a/ext/fg/js/popup-nested.js b/ext/fg/js/popup-nested.js
index 1b5ab8f7..31cb1cda 100644
--- a/ext/fg/js/popup-nested.js
+++ b/ext/fg/js/popup-nested.js
@@ -33,7 +33,10 @@ async function popupNestedInitialize(id, depth, parentFrameId, url) {
         return;
     }
 
-    const ignoreNodes = options.scanning.enableOnPopupExpressions ? [] : ['.expression-scan-toggle', '.expression-scan-toggle *'];
+    const ignoreNodes = ['.scan-disable', '.scan-disable *'];
+    if (!options.scanning.enableOnPopupExpressions) {
+        ignoreNodes.push('.expression-scan-toggle', '.expression-scan-toggle *');
+    }
 
     window.frontendInitializationData = {id, depth, parentFrameId, ignoreNodes, url, proxy: true};
 
-- 
cgit v1.2.3