Merge pull request #303 from ueokande/properties

Properties support

1 files changed, 7 insertions, 11 deletions

diff --git a/src/settings/actions/setting.js b/src/settings/actions/setting.js
index 1d01fda..92c9f8a 100644
--- a/src/settings/actions/setting.js
+++ b/src/settings/actions/setting.js
@@ -1,26 +1,22 @@
 import actions from 'settings/actions';
 import messages from 'shared/messages';
 import DefaultSettings from 'shared/settings/default';
+import * as settingsStorage from 'shared/settings/storage';
 import * as settingsValues from 'shared/settings/values';
 
 const load = () => {
-  return browser.storage.local.get('settings').then(({ settings }) => {
-    if (!settings) {
-      return set(DefaultSettings);
-    }
-    return set(Object.assign({}, DefaultSettings, settings));
-  }, console.error);
+  return settingsStorage.loadRaw().then((settings) => {
+    return set(settings);
+  });
 };
 
 const save = (settings) => {
-  return browser.storage.local.set({
-    settings,
-  }).then(() => {
+  return settingsStorage.save(settings).then(() => {
     return browser.runtime.sendMessage({
       type: messages.SETTINGS_RELOAD
-    }).then(() => {
-      return set(settings);
     });
+  }).then(() => {
+    return set(settings);
   });
 };