diff options
author | siikamiika <siikamiika@users.noreply.github.com> | 2019-11-09 13:01:21 +0200 |
---|---|---|
committer | siikamiika <siikamiika@users.noreply.github.com> | 2019-11-09 13:01:21 +0200 |
commit | 40c8268fd6b32c9918fbebd374723cd17f2e19aa (patch) | |
tree | a8bf88d760a99d1a0ef61b5542f7cc589a49bf8b | |
parent | cf0bb0a9e22bc5dee47d9a4d8b844c0ca67c0269 (diff) |
always disable scanning IME checkbox label
-rw-r--r-- | ext/bg/js/search-frontend.js | 5 | ||||
-rw-r--r-- | ext/bg/search.html | 2 | ||||
-rw-r--r-- | ext/fg/js/popup-nested.js | 5 |
3 files changed, 9 insertions, 3 deletions
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}; |