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

fix but failed

Browse source
This commit is contained in:
Shin'ya Ueoka 2018-06-28 20:44:57 +09:00
parent 03cf265eff
commit e2fb33bdc5
20 changed files with 74 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/shared/settings/storage.js
View file

@ -6,7 +6,7 @@ const loadRaw = async() => {
if (!settings) {
return DefaultSettings;
}
return Object.assign({}, DefaultSettings, settings);
return { ...DefaultSettings, ...settings };
};
const loadValue = async() => {
@ -20,9 +20,7 @@ const loadValue = async() => {
if (!value.properties) {
value.properties = {};
}
return Object.assign({},
settingsValues.valueFromJson(DefaultSettings.json),
value);
return { ...settingsValues.valueFromJson(DefaultSettings.json), ...value };
};
const save = (settings) => {

6
src/shared/settings/values.js
View file

@ -6,12 +6,12 @@ const operationFromFormName = (name) => {
if (argStr) {
args = JSON.parse(argStr);
}
return Object.assign({ type }, args);
return { type, ...args };
};
const operationToFormName = (op) => {
let type = op.type;
let args = Object.assign({}, op);
let args = { ...op };
delete args.type;
if (Object.keys(args).length === 0) {
@ -83,7 +83,7 @@ const formFromValue = (value, allowedOps) => {
}
}
let formProperties = Object.assign({}, properties.defaults, value.properties);
let formProperties = { ...properties.defaults, ...value.properties };
return {
keymaps,