Merge remote-tracking branch 'origin/master' into greenkeeper/css-loader-1.0.0

1 files changed, 9 insertions, 1 deletions

diff --git a/src/content/actions/setting.js b/src/content/actions/setting.js
index e34b6e0..1c15dd7 100644
--- a/src/content/actions/setting.js
+++ b/src/content/actions/setting.js
@@ -1,6 +1,7 @@
 import actions from 'content/actions';
 import * as keyUtils from 'shared/utils/keys';
 import operations from 'shared/operations';
+import messages from 'shared/messages';
 
 const reservedKeymaps = {
   '<Esc>': { type: operations.CANCEL },
@@ -26,4 +27,11 @@ const set = (value) => {
   };
 };
 
-export { set };
+const load = async() => {
+  let settings = await browser.runtime.sendMessage({
+    type: messages.SETTINGS_QUERY,
+  });
+  return set(settings);
+};
+
+export { set, load };