From ad71e692fd0254b430c38b47b6c5a9ab3e08290b Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Mon, 1 Feb 2016 12:16:32 +0000
Subject: Wait-for-enter: add necessary option support.

---
 pages/options.coffee | 15 +++++++++------
 pages/options.html   | 19 +++++++++++++++++--
 2 files changed, 26 insertions(+), 8 deletions(-)

(limited to 'pages')

diff --git a/pages/options.coffee b/pages/options.coffee
index f0de5342..51400740 100644
--- a/pages/options.coffee
+++ b/pages/options.coffee
@@ -184,6 +184,7 @@ class ExclusionRulesOnPopupOption extends ExclusionRulesOption
 Options =
   exclusionRules: ExclusionRulesOption
   filterLinkHints: CheckBoxOption
+  waitForEnterForFilteredHints: CheckBoxOption
   hideHud: CheckBoxOption
   keyMappings: TextOption
   linkHintCharacters: NonEmptyTextOption
@@ -206,14 +207,16 @@ initOptionsPage = ->
 
   # Display either "linkHintNumbers" or "linkHintCharacters", depending upon "filterLinkHints".
   maintainLinkHintsView = ->
-    hide = (el) -> el.parentNode.parentNode.style.display = "none"
-    show = (el) -> el.parentNode.parentNode.style.display = "table-row"
+    hide = (el) -> el.style.display = "none"
+    show = (el) -> el.style.display = "table-row"
     if $("filterLinkHints").checked
-      hide $("linkHintCharacters")
-      show $("linkHintNumbers")
+      hide $("linkHintCharactersContainer")
+      show $("linkHintNumbersContainer")
+      show $("waitForEnterForFilteredHintsContainer")
     else
-      show $("linkHintCharacters")
-      hide $("linkHintNumbers")
+      show $("linkHintCharactersContainer")
+      hide $("linkHintNumbersContainer")
+      hide $("waitForEnterForFilteredHintsContainer")
 
   maintainAdvancedOptions = ->
     if bgSettings.get "optionsPage_showAdvancedOptions"
diff --git a/pages/options.html b/pages/options.html
index b5aa5936..2a425efe 100644
--- a/pages/options.html
+++ b/pages/options.html
@@ -82,7 +82,7 @@ b: http://b.com/?q=%s description
               <input id="scrollStepSize" type="number" />px
             </td>
           </tr>
-          <tr>
+          <tr id="linkHintCharactersContainer">
             <td class="caption">Characters used<br/> for link hints</td>
             <td verticalAlign="top">
                 <div class="help">
@@ -94,7 +94,7 @@ b: http://b.com/?q=%s description
                 <div class="nonEmptyTextOption">
             </td>
           </tr>
-          <tr>
+          <tr id="linkHintNumbersContainer">
             <td class="caption">Numbers used<br/> for link hints</td>
             <td verticalAlign="top">
                 <div class="help">
@@ -129,6 +129,21 @@ b: http://b.com/?q=%s description
               </label>
             </td>
           </tr>
+          <tr id="waitForEnterForFilteredHintsContainer">
+            <td class="caption"></td>
+            <td verticalAlign="top" class="booleanOption">
+              <div class="help">
+                <div class="example">
+                  You activate the link with <tt>Enter</tt>, <em>always</em>; so you never accidentally type Vimium
+                  commands.
+                </div>
+              </div>
+              <label>
+                <input id="waitForEnterForFilteredHints" type="checkbox"/>
+                Require <tt>Enter</tt> for filtered hints
+              </label>
+            </td>
+          </tr>
           <tr>
             <td class="caption"></td>
             <td verticalAlign="top" class="booleanOption">
-- 
cgit v1.2.3


From 8eda277c1bfedf898996660e107dd5cb2183a4c9 Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Mon, 1 Feb 2016 12:50:28 +0000
Subject: Wait-for-enter: better wording on options page.

---
 pages/options.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pages')

diff --git a/pages/options.html b/pages/options.html
index 2a425efe..ac515db9 100644
--- a/pages/options.html
+++ b/pages/options.html
@@ -140,7 +140,7 @@ b: http://b.com/?q=%s description
               </div>
               <label>
                 <input id="waitForEnterForFilteredHints" type="checkbox"/>
-                Require <tt>Enter</tt> for filtered hints
+                Require <tt>Enter</tt> when filtering hints
               </label>
             </td>
           </tr>
-- 
cgit v1.2.3