diff --git a/src/settings/actions/setting.js b/src/settings/actions/setting.js index 3525f0a..c1b27c8 100644 --- a/src/settings/actions/setting.js +++ b/src/settings/actions/setting.js @@ -3,8 +3,7 @@ import messages from 'shared/messages'; import DefaultSettings from 'shared/default-settings'; const load = () => { - return browser.storage.local.get('settings').then((value) => { - let settings = value.settings; + return browser.storage.local.get('settings').then(({ settings }) => { if (settings) { return set(settings); } @@ -18,6 +17,8 @@ const save = (settings) => { }).then(() => { return browser.runtime.sendMessage({ type: messages.SETTINGS_RELOAD + }).then(() => { + return set(settings); }); }); }; @@ -25,6 +26,7 @@ const save = (settings) => { const set = (settings) => { return { type: actions.SETTING_SET_SETTINGS, + source: settings.source, json: settings.json, value: JSON.parse(settings.json), }; diff --git a/src/settings/components/index.jsx b/src/settings/components/index.jsx index e57b09d..4418942 100644 --- a/src/settings/components/index.jsx +++ b/src/settings/components/index.jsx @@ -2,7 +2,7 @@ import './site.scss'; import React from 'react'; import PropTypes from 'prop-types'; import * as settingActions from 'settings/actions/setting'; -import { validate } from 'shared/validators/setting'; +import * as validator from 'shared/validators/setting'; class SettingsComponent extends React.Component { constructor(props, context) { @@ -22,39 +22,42 @@ class SettingsComponent extends React.Component { stateChanged() { let settings = this.context.store.getState(); - this.setState({ settings }); + this.setState({ + settings: { + source: settings.source, + json: settings.json, + } + }); } render() { return (

Configure Vim-Vixen

+
- - -