From ca062014c56ef9f650754ea17780a461521814f6 Mon Sep 17 00:00:00 2001
From: Bill Casarin
Date: Thu, 23 Sep 2010 02:17:24 -0400
Subject: Added narrow link hints option to advanced settings

---
 options.html | 43 ++++++++++++++++++++++++++++++++++++-------
 1 file changed, 36 insertions(+), 7 deletions(-)

(limited to 'options.html')

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">
-- 
cgit v1.2.3


From 5e76ae6624a264d1bd058cb756ee7528e199d77b Mon Sep 17 00:00:00 2001
From: Bill Casarin
Date: Tue, 28 Sep 2010 06:49:28 -0400
Subject: Changed the wording from Narrow to Filter

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

(limited to 'options.html')

diff --git a/options.html b/options.html
index 81360004..123c51a4 100644
--- a/options.html
+++ b/options.html
@@ -273,7 +273,7 @@
         </td>
       </tr>
       <tr class="advancedOption">
-        <td class="caption">Narrow link hints</td>
+        <td class="caption">Filter link hints</td>
         <td verticalAlign="top">
           <div class="help">
             <div class="example">
-- 
cgit v1.2.3


From 3ffadaa2f3312e25b13274e70ecafa1883aafa93 Mon Sep 17 00:00:00 2001
From: jez
Date: Fri, 31 Dec 2010 15:29:14 +0800
Subject: Change 'narrow' to 'filter' in variable names.

---
 options.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'options.html')

diff --git a/options.html b/options.html
index 123c51a4..8be47f4c 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", "narrowLinkHints"];
+    "userDefinedLinkHintCss", "keyMappings", "filterLinkHints"];
 
   var postSaveHooks = {
     "keyMappings": function (value) {
@@ -95,7 +95,7 @@
     populateOptions();
     for (var i = 0; i < editableFields.length; i++)
       $(editableFields[i]).addEventListener("keyup", onOptionKeyup, false);
-    $("narrowLinkHints").addEventListener("click", onOptionKeyup, false);
+    $("filterLinkHints").addEventListener("click", onOptionKeyup, false);
     $("advancedOptions").addEventListener("click", openAdvancedOptions, false);
     $("showCommands").addEventListener("click", function () {
       showDialog("vimiumCommandListingContainer",
@@ -281,7 +281,7 @@
               Note: You <em>must</em> use numeric link hint characters in this mode
             </div>
           </div>
-          <input id="narrowLinkHints" type="checkbox"/>
+          <input id="filterLinkHints" type="checkbox"/>
         </td>
       </tr>
     </table>
-- 
cgit v1.2.3


From 067619766715f5aca7554a818a475419fc665e63 Mon Sep 17 00:00:00 2001
From: jez
Date: Fri, 31 Dec 2010 15:22:05 +0800
Subject: Tidy up checkbox handling in the options page.

Disable linkHintCharacters textbox when filterLinkHints option is on.

Enable save button whenever there is data change in the form (keyup
event does not account for the possibility of data change via mouse
copy/paste, however unlikely that use case seems.)
---
 options.html | 61 +++++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 40 insertions(+), 21 deletions(-)

(limited to 'options.html')

diff --git a/options.html b/options.html
index 8be47f4c..f752abcd 100644
--- a/options.html
+++ b/options.html
@@ -70,7 +70,10 @@
       tr.advancedOption {
         display:none;
       }
-
+      input:read-only {
+        background-color: #eee;
+        color: #666;
+      }
     </style>
 
   <script type="text/javascript">
@@ -93,9 +96,13 @@
 
   function initializeOptions() {
     populateOptions();
-    for (var i = 0; i < editableFields.length; i++)
+
+    for (var i = 0; i < editableFields.length; i++) {
       $(editableFields[i]).addEventListener("keyup", onOptionKeyup, false);
-    $("filterLinkHints").addEventListener("click", onOptionKeyup, false);
+      $(editableFields[i]).addEventListener("change", enableSaveButton, false);
+      $(editableFields[i]).addEventListener("change", onDataLoaded, false);
+    }
+
     $("advancedOptions").addEventListener("click", openAdvancedOptions, false);
     $("showCommands").addEventListener("click", function () {
       showDialog("vimiumCommandListingContainer",
@@ -104,11 +111,14 @@
   }
 
   function onOptionKeyup(event) {
-    var isCheckbox = event.target.getAttribute("type") == "checkbox";
-    if (isCheckbox || event.target.getAttribute("savedValue") != event.target.value)
+    if (event.target.getAttribute("savedValue") != event.target.value)
       enableSaveButton();
   }
 
+  function onDataLoaded() {
+    $("linkHintCharacters").readOnly = $("filterLinkHints").checked;
+  }
+
   function enableSaveButton() { $("saveOptions").removeAttribute("disabled"); }
 
   // Saves options to localStorage.
@@ -118,19 +128,23 @@
     for (var i = 0; i < editableFields.length; i++) {
       var fieldName = editableFields[i];
       var field = $(fieldName);
-      var fieldValue = field.value.trim();
-      var defaultFieldValue = (defaultSettings[fieldName] != null) ?
-        defaultSettings[fieldName].toString() : "";
 
-      if (field.getAttribute("type") == "checkbox")
+      var fieldValue;
+      if (field.getAttribute("type") == "checkbox") {
         fieldValue = field.checked ? "true" : "false";
+      } else {
+        fieldValue = field.value.trim();
+        field.value = fieldValue;
+      }
+
+      var defaultFieldValue = (defaultSettings[fieldName] != null) ?
+        defaultSettings[fieldName].toString() : "";
 
       if (fieldValue == defaultFieldValue)
         delete localStorage[fieldName];
       else
         localStorage[fieldName] = fieldValue;
 
-      field.value = fieldValue;
       field.setAttribute("savedValue", fieldValue);
 
       if (postSaveHooks[fieldName]) { postSaveHooks[fieldName](fieldValue); }
@@ -143,24 +157,29 @@
     for (var i = 0; i < editableFields.length; i++) {
       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);
+      setFieldValue($(editableFields[i]), val);
     }
+    onDataLoaded();
   }
 
   function restoreToDefaults() {
-    for (var i = 0; i < editableFields.length; i++)
-      $(editableFields[i]).value = defaultSettings[editableFields[i]] || "";
+    for (var i = 0; i < editableFields.length; i++) {
+      var val = defaultSettings[editableFields[i]] || "";
+      setFieldValue($(editableFields[i]), val);
+    }
+    onDataLoaded();
     enableSaveButton();
   }
 
+  function setFieldValue(field, value) {
+    if (field.getAttribute('type') == 'checkbox')
+      field.checked = value == "true";
+    else
+      field.value = value;
+
+    field.setAttribute("savedValue", value);
+  }
+
   function openAdvancedOptions(event) {
     var elements = document.getElementsByClassName("advancedOption");
     for (var i = 0; i < elements.length; i++)
-- 
cgit v1.2.3


From baf3dd02d5891df9a35af7d2f8f2eaa42ac6bb03 Mon Sep 17 00:00:00 2001
From: jez
Date: Mon, 3 Jan 2011 04:29:12 +0800
Subject: Revise how the linkHints object is generated. Add lib/utils.js.

Extend a template object rather than using prototype inheritance. The
previous method created confusion about whether a given property resided
in the base or in the specialization.
---
 options.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'options.html')

diff --git a/options.html b/options.html
index f752abcd..44b1d3e2 100644
--- a/options.html
+++ b/options.html
@@ -1,6 +1,7 @@
 <html>
   <head>
     <title>Vimium Options</title>
+    <script src="lib/utils.js"></script>
     <script src="lib/keyboardUtils.js"></script>
     <script src="linkHints.js"></script>
     <script src="lib/clipboard.js"></script>
-- 
cgit v1.2.3