diff options
| -rw-r--r-- | background_page.html | 1 | ||||
| -rw-r--r-- | linkHints.js | 2 | ||||
| -rw-r--r-- | options.html | 43 | ||||
| -rw-r--r-- | vimiumFrontend.js | 2 |
4 files changed, 39 insertions, 9 deletions
diff --git a/background_page.html b/background_page.html index f4a40ffa..8f0cad23 100644 --- a/background_page.html +++ b/background_page.html @@ -26,6 +26,7 @@ scrollStepSize: 60, defaultZoomLevel: 100, linkHintCharacters: "sadfjklewcmpgh", + narrowLinkHints: false, userDefinedLinkHintCss: ".vimiumHintMarker {\n\n}\n" + ".vimiumHintMarker > .matchingCharacter {\n\n}" diff --git a/linkHints.js b/linkHints.js index 0023ea81..44a574bc 100644 --- a/linkHints.js +++ b/linkHints.js @@ -34,7 +34,7 @@ var clickableElementsXPath = (function() { })(); function isNarrowMode() { - return true; + return settings.narrowLinkHints == "true"; } // We need this as a top-level function because our command system doesn't yet support arguments. diff --git a/options.html b/options.html index 344fc01d..81360004 100644 --- a/options.html +++ b/options.html @@ -80,7 +80,7 @@ var defaultSettings = chrome.extension.getBackgroundPage().defaultSettings; var editableFields = ["scrollStepSize", "defaultZoomLevel", "excludedUrls", "linkHintCharacters", - "userDefinedLinkHintCss", "keyMappings"]; + "userDefinedLinkHintCss", "keyMappings", "narrowLinkHints"]; var postSaveHooks = { "keyMappings": function (value) { @@ -95,6 +95,7 @@ populateOptions(); for (var i = 0; i < editableFields.length; i++) $(editableFields[i]).addEventListener("keyup", onOptionKeyup, false); + $("narrowLinkHints").addEventListener("click", onOptionKeyup, false); $("advancedOptions").addEventListener("click", openAdvancedOptions, false); $("showCommands").addEventListener("click", function () { showDialog("vimiumCommandListingContainer", @@ -103,7 +104,8 @@ } function onOptionKeyup(event) { - if (event.target.getAttribute("savedValue") != event.target.value) + var isCheckbox = event.target.getAttribute("type") == "checkbox"; + if (isCheckbox || event.target.getAttribute("savedValue") != event.target.value) enableSaveButton(); } @@ -115,15 +117,21 @@ // the freedom to change the defaults in the future. for (var i = 0; i < editableFields.length; i++) { var fieldName = editableFields[i]; - var fieldValue = $(fieldName).value.trim(); + var field = $(fieldName); + var fieldValue = field.value.trim(); var defaultFieldValue = (defaultSettings[fieldName] != null) ? defaultSettings[fieldName].toString() : ""; + + if (field.getAttribute("type") == "checkbox") + fieldValue = field.checked ? "true" : "false"; + if (fieldValue == defaultFieldValue) delete localStorage[fieldName]; else localStorage[fieldName] = fieldValue; - $(fieldName).value = fieldValue; - $(fieldName).setAttribute("savedValue", fieldValue); + + field.value = fieldValue; + field.setAttribute("savedValue", fieldValue); if (postSaveHooks[fieldName]) { postSaveHooks[fieldName](fieldValue); } } @@ -133,8 +141,17 @@ // Restores select box state to saved value from localStorage. function populateOptions() { for (var i = 0; i < editableFields.length; i++) { - $(editableFields[i]).value = localStorage[editableFields[i]] || defaultSettings[editableFields[i]] || ""; - $(editableFields[i]).setAttribute("savedValue", $(editableFields[i]).value); + var val = localStorage[editableFields[i]] || defaultSettings[editableFields[i]] || ""; + var field = $(editableFields[i]); + + // if a true or false is stored, assume we're working with a checkbox + if (val == "true") + field.checked = true; + if (val == "false") + field.checked = false; + + field.value = val; + field.setAttribute("savedValue", field.value); } } @@ -255,6 +272,18 @@ <textarea id="userDefinedLinkHintCss" type="text"></textarea> </td> </tr> + <tr class="advancedOption"> + <td class="caption">Narrow link hints</td> + <td verticalAlign="top"> + <div class="help"> + <div class="example"> + Typing in link hints mode will filter link hints by the link text.<br/><br/> + Note: You <em>must</em> use numeric link hint characters in this mode + </div> + </div> + <input id="narrowLinkHints" type="checkbox"/> + </td> + </tr> </table> <div id="buttonsPanel"> diff --git a/vimiumFrontend.js b/vimiumFrontend.js index b108d141..30c87153 100644 --- a/vimiumFrontend.js +++ b/vimiumFrontend.js @@ -5,7 +5,7 @@ * commands by connectiong to a port named "domReady". */ var settings = {}; -var settingsToLoad = ["scrollStepSize", "linkHintCharacters"]; +var settingsToLoad = ["scrollStepSize", "linkHintCharacters", "narrowLinkHints"]; var getCurrentUrlHandlers = []; // function(url) |