Options page should use the background settings object directly.

Makes for less complicated code. Closes #479.

1 files changed, 7 insertions, 10 deletions

diff --git a/options.html b/options.html
index 3dc34917..5cfc3892 100644
--- a/options.html
+++ b/options.html
@@ -87,7 +87,7 @@
 
   <script type="text/javascript">
   $ = function(id) { return document.getElementById(id); };
-  var defaultSettings = chrome.extension.getBackgroundPage().settings.defaults;
+  var bgSettings = chrome.extension.getBackgroundPage().settings;
 
   var editableFields = ["scrollStepSize", "excludedUrls", "linkHintCharacters", "userDefinedLinkHintCss",
                         "keyMappings", "filterLinkHints", "previousPatterns", "nextPatterns", "hideHud"];
@@ -104,10 +104,7 @@
   };
 
   function initializeOptions() {
-    if (settings.isLoaded)
-      populateOptions();
-    else
-      settings.addEventListener("load", populateOptions);
+    populateOptions();
 
     for (var i = 0; i < editableFields.length; i++) {
       $(editableFields[i]).addEventListener("keyup", onOptionKeyup, false);
@@ -151,10 +148,10 @@
 
       // If it's empty and not a field that we allow to be empty, restore to the default value
       if (!fieldValue && canBeEmptyFields.indexOf(fieldName) == -1) {
-        settings.clear(fieldName);
-        fieldValue = settings.get(fieldName);
+        bgSettings.clear(fieldName);
+        fieldValue = bgSettings.get(fieldName);
       } else
-        settings.set(fieldName, fieldValue);
+        bgSettings.set(fieldName, fieldValue);
 
       $(fieldName).value = fieldValue;
       $(fieldName).setAttribute("savedValue", fieldValue);
@@ -167,7 +164,7 @@
   // Restores select box state to saved value from localStorage.
   function populateOptions() {
     for (var i = 0; i < editableFields.length; i++) {
-      var val = settings.get(editableFields[i]) || "";
+      var val = bgSettings.get(editableFields[i]) || "";
       setFieldValue($(editableFields[i]), val);
     }
     onDataLoaded();
@@ -175,7 +172,7 @@
 
   function restoreToDefaults() {
     for (var i = 0; i < editableFields.length; i++) {
-      var val = defaultSettings[editableFields[i]] || "";
+      var val = bgSettings.defaults[editableFields[i]] || "";
       setFieldValue($(editableFields[i]), val);
     }
     onDataLoaded();