From c913dcdec775094daa9a64fa40034b3122320660 Mon Sep 17 00:00:00 2001
From: Shin'ya Ueoka <ueokande@i-beam.org>
Date: Mon, 9 Oct 2017 15:30:05 +0900
Subject: parse json in settings

---
 src/settings/actions/setting.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'src/settings/actions')

diff --git a/src/settings/actions/setting.js b/src/settings/actions/setting.js
index 697bcf0..3525f0a 100644
--- a/src/settings/actions/setting.js
+++ b/src/settings/actions/setting.js
@@ -4,8 +4,9 @@ import DefaultSettings from 'shared/default-settings';
 
 const load = () => {
   return browser.storage.local.get('settings').then((value) => {
-    if (value.settings) {
-      return set(value.settings);
+    let settings = value.settings;
+    if (settings) {
+      return set(settings);
     }
     return set(DefaultSettings);
   }, console.error);
@@ -13,7 +14,7 @@ const load = () => {
 
 const save = (settings) => {
   return browser.storage.local.set({
-    settings
+    settings,
   }).then(() => {
     return browser.runtime.sendMessage({
       type: messages.SETTINGS_RELOAD
@@ -24,8 +25,9 @@ const save = (settings) => {
 const set = (settings) => {
   return {
     type: actions.SETTING_SET_SETTINGS,
-    settings,
+    json: settings.json,
+    value: JSON.parse(settings.json),
   };
 };
 
-export { load, save, set };
+export { load, save };
-- 
cgit v1.2.3