Clean settings components

This commit is contained in:
Shin'ya Ueoka 2019-04-29 15:27:23 +09:00
parent 25111f9de4
commit be900aa25c
18 changed files with 77 additions and 74 deletions

View file

@ -1,8 +1,8 @@
import actions from 'settings/actions';
import * as validator from 'shared/settings/validator';
import KeymapsForm from '../components/form/keymaps-form';
import * as settingsValues from 'shared/settings/values';
import * as settingsStorage from 'shared/settings/storage';
import keymaps from '../keymaps';
const load = async() => {
let settings = await settingsStorage.loadRaw();
@ -29,8 +29,7 @@ const save = async(settings) => {
const switchToForm = (json) => {
try {
validator.validate(JSON.parse(json));
// AllowdOps filters operations, this is dirty dependency
let form = settingsValues.formFromJson(json, KeymapsForm.AllowdOps);
let form = settingsValues.formFromJson(json, keymaps.allowedOps);
return {
type: actions.SETTING_SWITCH_TO_FORM,
form,