diff options
| author | Stephen Blott | 2014-04-19 07:41:31 +0100 |
|---|---|---|
| committer | Stephen Blott | 2014-04-19 07:41:31 +0100 |
| commit | 033d353b265fcd4e9963ef232c17d82d7bea43f1 (patch) | |
| tree | 87773ec1db54a25b1577647733e5533a0778fe8f /background_scripts | |
| parent | 654738cb4d566c5e0b2d1e229dd9055403af35f6 (diff) | |
| download | vimium-033d353b265fcd4e9963ef232c17d82d7bea43f1.tar.bz2 | |
Settings tests pass, Sync still has an error.
Diffstat (limited to 'background_scripts')
| -rw-r--r-- | background_scripts/settings.coffee | 4 | ||||
| -rw-r--r-- | background_scripts/sync.coffee | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/background_scripts/settings.coffee b/background_scripts/settings.coffee index ad89888e..f75c1db3 100644 --- a/background_scripts/settings.coffee +++ b/background_scripts/settings.coffee @@ -14,12 +14,12 @@ root.Settings = Settings = else jsonValue = JSON.stringify value localStorage[key] = jsonValue - root.Sync.set key, jsonValue + Sync.set key, jsonValue clear: (key) -> if @has key delete localStorage[key] - root.Sync.clear key + Sync.clear key has: (key) -> key of localStorage diff --git a/background_scripts/sync.coffee b/background_scripts/sync.coffee index 7cb77518..40e0c5c3 100644 --- a/background_scripts/sync.coffee +++ b/background_scripts/sync.coffee @@ -59,19 +59,19 @@ root.Sync = Sync = return # Ok: accept, store and propagate this update. - defaultValue = root.Settings.defaults[key] + defaultValue = Settings.defaults[key] defaultValueJSON = JSON.stringify(defaultValue) if value && value != defaultValueJSON # Key/value has been changed to non-default value at remote instance. @log "update: #{key}=#{value}" localStorage[key] = value - root.Settings.doPostUpdateHook key, JSON.parse(value) + Settings.doPostUpdateHook key, JSON.parse(value) else # Key has been reset to default value at remote instance. @log "clear: #{key}" delete localStorage[key] - root.Settings.doPostUpdateHook key, defaultValue + Settings.doPostUpdateHook key, defaultValue # Only called synchronously from within vimium, never on a callback. # No need to propagate updates into the rest of vimium. |
