From ea535672d76b0b5f847af346434ab996f461f68c Mon Sep 17 00:00:00 2001
From: mrmr1993
Date: Mon, 27 Apr 2015 20:48:02 +0100
Subject: Use lib/settings.coffee to provide settings to
options.html/popup.html
Instead of directly accessing the background page's Settings object,
the options page and the page popup now have their own.
---
pages/options.coffee | 10 ++++------
pages/options.html | 1 +
pages/popup.html | 2 ++
3 files changed, 7 insertions(+), 6 deletions(-)
(limited to 'pages')
diff --git a/pages/options.coffee b/pages/options.coffee
index 18ff226d..110f869c 100644
--- a/pages/options.coffee
+++ b/pages/options.coffee
@@ -1,7 +1,6 @@
$ = (id) -> document.getElementById id
-bgUtils = chrome.extension.getBackgroundPage().Utils
-bgSettings = chrome.extension.getBackgroundPage().Settings
+Settings.init()
bgExclusions = chrome.extension.getBackgroundPage().Exclusions
#
@@ -22,21 +21,20 @@ class Option
# Fetch a setting from localStorage, remember the @previous value and populate the DOM element.
# Return the fetched value.
fetch: ->
- @populateElement @previous = bgSettings.get @field
+ @populateElement @previous = Settings.get @field
@previous
# Write this option's new value back to localStorage, if necessary.
save: ->
value = @readValueFromElement()
if not @areEqual value, @previous
- bgSettings.set @field, @previous = value
- bgSettings.performPostUpdateHook @field, value
+ Settings.set @field, @previous = value
# Compare values; this is overridden by sub-classes.
areEqual: (a,b) -> a == b
restoreToDefault: ->
- bgSettings.clear @field
+ Settings.clear @field
@fetch()
# Static method.
diff --git a/pages/options.html b/pages/options.html
index 0fa5b18d..67e2b16d 100644
--- a/pages/options.html
+++ b/pages/options.html
@@ -3,6 +3,7 @@
Vimium Options
+
diff --git a/pages/popup.html b/pages/popup.html
index c7e2fd6f..fdf116e5 100644
--- a/pages/popup.html
+++ b/pages/popup.html
@@ -48,6 +48,8 @@
}
+
+
--
cgit v1.2.3