From 992852d3c0aab94044e4a850f598bed38dbc2579 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Wed, 24 May 2017 20:42:54 -0700
Subject: [PATCH] make form search be always enabled

---
 ext/bg/js/options.js |  2 --
 ext/bg/js/util.js    |  1 -
 ext/bg/options.html  | 12 ++++--------
 ext/fg/js/driver.js  |  2 +-
 ext/fg/js/util.js    |  4 ++--
 5 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/ext/bg/js/options.js b/ext/bg/js/options.js
index 1bd106d8..8c9e49e1 100644
--- a/ext/bg/js/options.js
+++ b/ext/bg/js/options.js
@@ -39,7 +39,6 @@ function formRead() {
         optionsNew.scanning.requireShift = $('#hold-shift-to-scan').prop('checked');
         optionsNew.scanning.middleMouse = $('#middle-mouse-button-scan').prop('checked');
         optionsNew.scanning.selectText = $('#select-matched-text').prop('checked');
-        optionsNew.scanning.imposter = $('#search-form-text-fields').prop('checked');
         optionsNew.scanning.alphanumeric = $('#search-alphanumeric').prop('checked');
         optionsNew.scanning.delay = parseInt($('#scan-delay').val(), 10);
         optionsNew.scanning.length = parseInt($('#scan-length').val(), 10);
@@ -136,7 +135,6 @@ $(document).ready(() => {
         $('#hold-shift-to-scan').prop('checked', options.scanning.requireShift);
         $('#middle-mouse-button-scan').prop('checked', options.scanning.middleMouse);
         $('#select-matched-text').prop('checked', options.scanning.selectText);
-        $('#search-form-text-fields').prop('checked', options.scanning.imposter);
         $('#search-alphanumeric').prop('checked', options.scanning.alphanumeric);
         $('#scan-delay').val(options.scanning.delay);
         $('#scan-length').val(options.scanning.length);
diff --git a/ext/bg/js/util.js b/ext/bg/js/util.js
index 6e97b0ea..413fbaca 100644
--- a/ext/bg/js/util.js
+++ b/ext/bg/js/util.js
@@ -111,7 +111,6 @@ function optionsSetDefaults(options) {
             requireShift: true,
             middleMouse: true,
             selectText: true,
-            imposter: true,
             alphanumeric: true,
             delay: 15,
             length: 10
diff --git a/ext/bg/options.html b/ext/bg/options.html
index 4898a3eb..e36e0511 100644
--- a/ext/bg/options.html
+++ b/ext/bg/options.html
@@ -90,10 +90,6 @@
                     <label><input type="checkbox" id="select-matched-text"> Select matched text</label>
                 </div>
 
-                <div class="checkbox">
-                    <label><input type="checkbox" id="search-form-text-fields"> Search form text fields</label>
-                </div>
-
                 <div class="checkbox">
                     <label><input type="checkbox" id="search-alphanumeric"> Search alphanumeric text</label>
                 </div>
@@ -173,15 +169,15 @@
                     <a href="https://foosoft.net/projects/anki-connect/">AnkiConnect</a> plugin for Anki.
                 </p>
 
-                <div class="checkbox">
-                    <label><input type="checkbox" id="anki-enable"> Enable Anki integration</label>
-                </div>
-
                 <div class="alert alert-danger" id="anki-error">
                     <strong>Error:</strong>
                     <span></span>
                 </div>
 
+                <div class="checkbox">
+                    <label><input type="checkbox" id="anki-enable"> Enable Anki integration</label>
+                </div>
+
                 <div id="anki-general">
                     <div class="checkbox options-advanced">
                         <label><input type="checkbox" id="generate-html-cards"> Generate HTML cards</label>
diff --git a/ext/fg/js/driver.js b/ext/fg/js/driver.js
index e11b5014..bdcc01b3 100644
--- a/ext/fg/js/driver.js
+++ b/ext/fg/js/driver.js
@@ -142,7 +142,7 @@ window.driver = new class {
             return;
         }
 
-        const textSource = docRangeFromPoint(point, this.options.scanning.imposter);
+        const textSource = docRangeFromPoint(point);
         if (!textSource || !textSource.containsPoint(point)) {
             docImposterDestroy();
             return;
diff --git a/ext/fg/js/util.js b/ext/fg/js/util.js
index 88d160cc..a9e67976 100644
--- a/ext/fg/js/util.js
+++ b/ext/fg/js/util.js
@@ -112,12 +112,12 @@ function docImposterDestroy() {
     }
 }
 
-function docRangeFromPoint(point, imposter) {
+function docRangeFromPoint(point) {
     const element = document.elementFromPoint(point.x, point.y);
     if (element !== null) {
         if (element.nodeName === 'IMG' || element.nodeName === 'BUTTON') {
             return new TextSourceElement(element);
-        } else if (imposter && (element.nodeName === 'INPUT' || element.nodeName === 'TEXTAREA')) {
+        } else if (element.nodeName === 'INPUT' || element.nodeName === 'TEXTAREA') {
             docImposterCreate(element);
         }
     }