Allow using capital letters as link hint characters

2 files changed, 15 insertions, 7 deletions

diff --git a/content_scripts/link_hints.coffee b/content_scripts/link_hints.coffee
index eeadfc0c..403a4481 100644
--- a/content_scripts/link_hints.coffee
+++ b/content_scripts/link_hints.coffee
@@ -239,8 +239,11 @@ class LinkHintsMode
     # NOTE(smblott) As of 1.54, the Ctrl modifier doesn't work for filtered link hints; therefore we only
     # offer the control modifier for alphabet hints.  It is not clear whether we should fix this.  As of
     # 16-03-28, nobody has complained.
-    modifiers = ["Shift"]
-    modifiers.push "Control" unless Settings.get "filterLinkHints"
+    modifiers =
+      if Settings.get "filterLinkHints"
+        []
+      else
+        ["Control", "Shift"]
 
     if event.key in modifiers and
       @mode in [ OPEN_IN_CURRENT_TAB, OPEN_WITH_QUEUE, OPEN_IN_NEW_BG_TAB, OPEN_IN_NEW_FG_TAB ]
@@ -288,8 +291,13 @@ class LinkHintsMode
 
     else
       @tabCount = previousTabCount if event.ctrlKey or event.metaKey or event.altKey
+      keyChar =
+        if Settings.get "filterLinkHints"
+          KeyboardUtils.getKeyChar(event)
+        else
+          KeyboardUtils.getKeyChar(event).toLowerCase()
       unless event.repeat
-        if keyChar = KeyboardUtils.getKeyChar(event).toLowerCase()
+        if keyChar
           keyChar = " " if keyChar == "space"
           if keyChar.length == 1
             @markerMatcher.pushKeyChar keyChar
@@ -473,7 +481,7 @@ class AlphabetHints
   # For alphabet hints, <Space> always rotates the hints, regardless of modifiers.
   shouldRotateHints: -> true
 
-# Use numbers (usually) for hints, and also filter links by their text.
+# Use characters for hints, and also filter links by their text.
 class FilterHints
   constructor: ->
     @linkHintNumbers = Settings.get "linkHintNumbers"
diff --git a/pages/options.html b/pages/options.html
index 412e17df..46307b6f 100644
--- a/pages/options.html
+++ b/pages/options.html
@@ -115,11 +115,11 @@ b: http://b.com/?q=%s description
             </td>
           </tr>
           <tr id="linkHintNumbersContainer">
-            <td class="caption">Numbers used<br/> for link hints</td>
+            <td class="caption">Characters used<br/> for link hints</td>
             <td verticalAlign="top">
                 <div class="help">
                   <div class="example">
-                    The numbers placed next to each link after typing "f" to enter link-hint mode.
+                    The characters placed next to each link after typing "f" to enter link-hint mode.
                   </div>
                 </div>
                 <input id="linkHintNumbers" type="text" />
@@ -145,7 +145,7 @@ b: http://b.com/?q=%s description
               </div>
               <label>
                 <input id="filterLinkHints" type="checkbox"/>
-                Use the link's name and numbers for link-hint filtering
+                Use the link's name and characters for link-hint filtering
               </label>
             </td>
           </tr>