jab2870/Vim-Vixen
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Add keybindings form

Browse source
This commit is contained in:
Shin'ya Ueoka 2017-11-22 22:38:34 +09:00
parent d33b37cdb9
commit 4e5ddc1d57
7 changed files with 268 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/settings/actions/setting.js
View file

@ -4,10 +4,10 @@ import DefaultSettings from 'shared/default-settings';
const load = () => {
return browser.storage.local.get('settings').then(({ settings }) => {
if (settings) {
return set(settings);
if (!settings) {
return set(DefaultSettings);
}
return set(DefaultSettings);
return set(Object.assign({}, DefaultSettings, settings));
}, console.error);
};
@ -28,6 +28,7 @@ const set = (settings) => {
type: actions.SETTING_SET_SETTINGS,
source: settings.source,
json: settings.json,
form: settings.form,
value: JSON.parse(settings.json),
};
};