From 546638dd268c4c4338079cb87f0183bd706fea05 Mon Sep 17 00:00:00 2001
From: ilya
Date: Fri, 11 Feb 2011 12:16:07 -0800
Subject: Fix a bug where you can't save empty fields if there's a non-empty
 default. Also made the option saving code more robust to similar scenarios

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

(limited to 'options.html')

diff --git a/options.html b/options.html
index bfa01450..f52cb6ec 100644
--- a/options.html
+++ b/options.html
@@ -80,7 +80,9 @@
   var defaultSettings = chrome.extension.getBackgroundPage().defaultSettings;
 
   var editableFields = ["scrollStepSize", "defaultZoomLevel", "excludedUrls", "linkHintCharacters",
-    "userDefinedLinkHintCss", "keyMappings"];
+                        "userDefinedLinkHintCss", "keyMappings"];
+
+  var canBeEmptyFields = ["excludedUrls", "keyMappings", "userDefinedLinkHintCss"];
 
   var postSaveHooks = {
     keyMappings: function (value) {
@@ -118,10 +120,17 @@
       var fieldValue = $(fieldName).value.trim();
       var defaultFieldValue = (defaultSettings[fieldName] != null) ?
         defaultSettings[fieldName].toString() : "";
+
+      // Don't save to storage if it's equal to the default
       if (fieldValue == defaultFieldValue)
         delete localStorage[fieldName];
-      else
+      // ..or if it's empty and not a field that we allow to be empty.
+      else if (!fieldValue && canBeEmptyFields.indexOf(fieldName) == -1) {
+        delete localStorage[fieldName];
+        fieldValue = defaultFieldValue;
+      } else
         localStorage[fieldName] = fieldValue;
+
       $(fieldName).value = fieldValue;
       $(fieldName).setAttribute("savedValue", fieldValue);
 
@@ -133,7 +142,12 @@
   // 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]] || "";
+      // If it's null or undefined, let's go to the default. We want to allow empty strings in certain cases.
+      if (localStorage[editableFields[i]] != "" && !localStorage[editableFields[i]]) {
+        $(editableFields[i]).value = defaultSettings[editableFields[i]] || "";
+      } else {
+        $(editableFields[i]).value = localStorage[editableFields[i]];
+      }
       $(editableFields[i]).setAttribute("savedValue", $(editableFields[i]).value);
     }
   }
-- 
cgit v1.2.3


From c65e85a840ba25ee59141b8ae1c424ec804c81f9 Mon Sep 17 00:00:00 2001
From: ilya
Date: Fri, 11 Feb 2011 18:27:09 -0800
Subject: Make the options page use the normal help dialog code path when its
 showing the command view. This fixes a regression with the new advanced
 commands functionality -- the command view wasn't showing at all.

---
 options.html | 30 ++----------------------------
 1 file changed, 2 insertions(+), 28 deletions(-)

(limited to 'options.html')

diff --git a/options.html b/options.html
index f52cb6ec..4e2f6ecc 100644
--- a/options.html
+++ b/options.html
@@ -75,8 +75,6 @@
 
   <script type="text/javascript">
   $ = function(id) { return document.getElementById(id); };
-  currentlyShowingDialog = null;
-
   var defaultSettings = chrome.extension.getBackgroundPage().defaultSettings;
 
   var editableFields = ["scrollStepSize", "defaultZoomLevel", "excludedUrls", "linkHintCharacters",
@@ -99,8 +97,8 @@
       $(editableFields[i]).addEventListener("keyup", onOptionKeyup, false);
     $("advancedOptions").addEventListener("click", openAdvancedOptions, false);
     $("showCommands").addEventListener("click", function () {
-      showDialog("vimiumCommandListingContainer",
-        chrome.extension.getBackgroundPage().helpDialogHtml(true, true, "Command Listing"));
+      showHelpDialog(
+        chrome.extension.getBackgroundPage().helpDialogHtml(true, true, "Command Listing"), frameId);
     }, false);
   }
 
@@ -164,30 +162,6 @@
       elements[i].style.display = (elements[i].style.display == "table-row") ? "none" : "table-row";
     event.preventDefault();
   }
-
-  function showDialog(dialogId, dialogHtml) {
-    if (currentlyShowingDialog)
-      return false;
-
-    currentlyShowingDialog = dialogId;
-    var container = document.createElement("div");
-    container.id = currentlyShowingDialog;
-    container.innerHTML = dialogHtml;
-    container.getElementsByClassName("closeButton")[0].addEventListener("click", hideDialog, false);
-    container.getElementsByClassName("optionsPage")[0].style.display = 'none';
-    document.body.appendChild(container);
-    var dialog = document.getElementById("vimiumHelpDialog");
-    dialog.style.top = Math.max((window.innerHeight - dialog.clientHeight) / 2.0, 20) + "px";
-  }
-
-  function hideDialog() {
-    var dialog = document.getElementById(currentlyShowingDialog);
-    if (dialog)
-      dialog.parentNode.removeChild(dialog);
-
-    currentlyShowingDialog = null;
-  }
-
   </script>
 
   </head>
-- 
cgit v1.2.3