4 files changed, 44 insertions, 27 deletions

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 (
       <div>
         <h1>Configure Vim-Vixen</h1>
+        <form className='vimvixen-settings-form'>
 
-        <form id='vimvixen-settings-form' className='vimvixen-settings-form'
-          onSubmit={this.saveSettings.bind(this)}>
-          <label htmlFor='load-from-json'>Load from JSON:</label>
-          <textarea name='plain-json' spellCheck='false'
-            onInput={this.onPlainJsonChanged.bind(this)}
+          <p>Load settings from:</p>
+          <input type='radio' id='setting-source-json'
+            name='source'
+            value='json'
+            onChange={this.bindAndSave.bind(this)}
+            checked={this.state.settings.source === 'json'} />
+          <label htmlFor='settings-source-json'>JSON</label>
+
+          <textarea name='json' spellCheck='false'
+            onInput={this.validate.bind(this)}
             onChange={this.bindValue.bind(this)}
+            onBlur={this.bindAndSave.bind(this)}
             value={this.state.settings.json} />
-          <button type='submit'>Save</button>
         </form>
       </div>
     );
   }
 
-  saveSettings(e) {
-    let settings = {
-      json: e.target.elements['plain-json'].value,
-    };
-    this.context.store.dispatch(settingActions.save(settings));
-    e.preventDefault();
-  }
-
-  onPlainJsonChanged(e) {
+  validate(e) {
     try {
       let settings = JSON.parse(e.target.value);
-      validate(settings);
+      validator.validate(settings);
       e.target.setCustomValidity('');
     } catch (err) {
       e.target.setCustomValidity(err.message);
@@ -62,12 +65,22 @@ class SettingsComponent extends React.Component {
   }
 
   bindValue(e) {
-    let next = Object.assign({}, this.state, {
-      settings: {
-        'json': e.target.value,
-      }
-    });
-    this.setState(next);
+    let nextSettings = Object.assign({}, this.state.settings);
+    nextSettings[e.target.name] = e.target.value;
+
+    this.setState({ settings: nextSettings });
+  }
+
+  bindAndSave(e) {
+    this.bindValue(e);
+
+    try {
+      let json = this.state.settings.json;
+      validator.validate(JSON.parse(json));
+      this.context.store.dispatch(settingActions.save(this.state.settings));
+    } catch (err) {
+      // error already shown
+    }
   }
 }
 
diff --git a/src/settings/components/site.scss b/src/settings/components/site.scss
index 5707c8a..fae9c39 100644
--- a/src/settings/components/site.scss
+++ b/src/settings/components/site.scss
@@ -1,5 +1,5 @@
 .vimvixen-settings-form {
-  textarea[name=plain-json] {
+  textarea[name=json] {
     font-family: monospace;
     width: 100%;
     min-height: 64ex;
diff --git a/src/settings/reducers/setting.js b/src/settings/reducers/setting.js
index 7f32f72..a61c09f 100644
--- a/src/settings/reducers/setting.js
+++ b/src/settings/reducers/setting.js
@@ -1,6 +1,7 @@
 import actions from 'settings/actions';
 
 const defaultState = {
+  source: '',
   json: '',
   value: {}
 };
@@ -9,6 +10,7 @@ export default function reducer(state = defaultState, action = {}) {
   switch (action.type) {
   case actions.SETTING_SET_SETTINGS:
     return {
+      source: action.source,
       json: action.json,
       value: action.value,
     };