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/background/components/background.js | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'src/background/components/background.js')

diff --git a/src/background/components/background.js b/src/background/components/background.js
index 0570a5a..06b6900 100644
--- a/src/background/components/background.js
+++ b/src/background/components/background.js
@@ -22,15 +22,7 @@ export default class BackgroundComponent {
   }
 
   update() {
-    let state = this.store.getState();
-    this.updateSettings(state);
-  }
-
-  updateSettings(setting) {
-    if (!setting.settings.json) {
-      return;
-    }
-    this.settings = JSON.parse(setting.settings.json);
+    this.settings = this.store.getState();
   }
 
   onMessage(message, sender) {
@@ -58,7 +50,7 @@ export default class BackgroundComponent {
         });
       });
     case messages.SETTINGS_QUERY:
-      return Promise.resolve(this.store.getState().settings);
+      return Promise.resolve(this.store.getState().value);
     case messages.CONSOLE_QUERY_COMPLETIONS:
       return commands.complete(message.text, this.settings);
     case messages.SETTINGS_RELOAD:
-- 
cgit v1.2.3