From 30641f1b75a2a21b3bc3b3605bae634be7e809c9 Mon Sep 17 00:00:00 2001 From: Shin'ya Ueoka Date: Sat, 7 Oct 2017 22:31:37 +0900 Subject: load settings from content --- src/content/index.js | 15 ++++++++++++--- src/content/messages.js | 3 ++- 2 files changed, 14 insertions(+), 4 deletions(-) (limited to 'src/content') diff --git a/src/content/index.js b/src/content/index.js index 09143b0..a2e3e3d 100644 --- a/src/content/index.js +++ b/src/content/index.js @@ -21,16 +21,25 @@ store.subscribe(() => { consoleFrames.initialize(window.document); +const reloadSettings = () => { + return browser.runtime.sendMessage({ + type: messages.SETTINGS_QUERY, + }).then((settings) => { + store.dispatch(settingActions.set(settings)); + }); +}; + browser.runtime.onMessage.addListener((action) => { switch (action.type) { case messages.CONSOLE_HIDE: window.focus(); consoleFrames.blur(window.document); return Promise.resolve(); - case messages.CONTENT_SET_SETTINGS: - store.dispatch(settingActions.set(action.settings)); - return Promise.resolve(); + case messages.SETTINGS_CHANGED: + return reloadSettings(); default: return Promise.resolve(); } }); + +reloadSettings(); diff --git a/src/content/messages.js b/src/content/messages.js index eb056a7..138f0e0 100644 --- a/src/content/messages.js +++ b/src/content/messages.js @@ -1,5 +1,6 @@ export default { - CONTENT_SET_SETTINGS: 'content.set.settings', + SETTINGS_QUERY: 'settings.query', + BACKGROUND_OPERATION: 'background.operation', CONSOLE_BLURRED: 'console.blured', -- cgit v1.2.3