aboutsummaryrefslogtreecommitdiff
path: root/src/shared/settings/values.js
diff options
context:
space:
mode:
authorShin'ya Ueoka <ueokande@i-beam.org>2018-06-28 20:44:57 +0900
committerShin'ya Ueoka <ueokande@i-beam.org>2018-06-28 20:44:57 +0900
commite2fb33bdc513385e9d71bc5b3d5068f7db9713d7 (patch)
tree28d544a6fd2237f5d0ed7809d45d783c18b9261f /src/shared/settings/values.js
parent03cf265eff0f4866959369531c2a1f5a5a0684b7 (diff)
fix but failed
Diffstat (limited to 'src/shared/settings/values.js')
-rw-r--r--src/shared/settings/values.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/shared/settings/values.js b/src/shared/settings/values.js
index bd03be2..9828af6 100644
--- a/src/shared/settings/values.js
+++ b/src/shared/settings/values.js
@@ -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,