Merge branch 'master' into firefox-amo

1 files changed, 23 insertions, 18 deletions

diff --git a/ext/bg/options.html b/ext/bg/options.html
index c3799b61..6a359f5e 100644
--- a/ext/bg/options.html
+++ b/ext/bg/options.html
@@ -8,6 +8,7 @@
         <style>
             #anki-spinner, #anki-general, #anki-error,
             #dict-spinner, #dict-error, #dict-warning, #dict-purge-progress, #dict-import-progress,
+            #debug,
             .options-advanced {
                 display: none;
             }
@@ -38,7 +39,7 @@
                 </div>
 
                 <div class="checkbox options-advanced">
-                    <label><input type="checkbox" id="soft-katakana-search"> Soft Katakana search</label>
+                    <label><input type="checkbox" id="show-debug-info"> Show debug information</label>
                 </div>
 
                 <div class="form-group">
@@ -46,7 +47,7 @@
                     <select class="form-control" id="audio-playback-source">
                         <option value="disabled">Disabled</option>
                         <option value="jpod101">JapanesePod101</option>
-                        <option value="jpod101-alternate">JapanesePod101 (Alternate)</option>
+                        <option value="jpod101-alternate">JapanesePod101 (alternate)</option>
                     </select>
                 </div>
 
@@ -61,7 +62,7 @@
                 </div>
 
                 <div class="form-group options-advanced">
-                    <label>Popup size (width x height, in pixels)</label>
+                    <label>Popup size (width &times; height, in pixels)</label>
                     <div class="row">
                         <div class="col-xs-6"><input type="number" min="1" id="popup-width" class="form-control"></div>
                         <div class="col-xs-6"><input type="number" min="1" id="popup-height" class="form-control"></div>
@@ -82,30 +83,32 @@
                 </div>
 
                 <div class="checkbox">
-                    <label><input type="checkbox" id="hold-shift-to-scan"> Hold <kbd>Shift</kbd> to scan</label>
-                </div>
-
-                <div class="checkbox">
                     <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>
 
                 <div class="form-group options-advanced">
-                    <label for="scan-delay">Scan delay</label>
+                    <label for="scan-delay">Scan delay (in milliseconds)</label>
                     <input type="number" min="1" id="scan-delay" class="form-control">
                 </div>
 
                 <div class="form-group options-advanced">
-                    <label for="scan-length">Scan length</label>
+                    <label for="scan-length">Scan length (in characters)</label>
                     <input type="number" min="1" id="scan-length" class="form-control">
                 </div>
+
+                <div class="form-group">
+                    <label for="scan-modifier-key">Scan modifier key</label>
+                    <select class="form-control" id="scan-modifier-key">
+                        <option value="none">None</option>
+                        <option value="alt">Alt</option>
+                        <option value="ctrl">Ctrl</option>
+                        <option value="shift">Shift</option>
+                    </select>
+                </div>
             </div>
 
             <div>
@@ -172,15 +175,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>
@@ -192,7 +195,7 @@
                     </div>
 
                     <div class="form-group options-advanced">
-                        <label for="sentence-detection-extent">Sentence detection extent</label>
+                        <label for="sentence-detection-extent">Sentence detection extent (in characters)</label>
                         <input type="number" min="1" id="sentence-detection-extent" class="form-control">
                     </div>
 
@@ -268,6 +271,8 @@
                         <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=4DBTN9A3CUAFN"><img src="/bg/img/paypal.gif" alt></a>
                     </p>
                 </div>
+
+                <pre id="debug"></pre>
             </div>
 
             <div class="pull-right">