From e2fb33bdc513385e9d71bc5b3d5068f7db9713d7 Mon Sep 17 00:00:00 2001
From: Shin'ya Ueoka <ueokande@i-beam.org>
Date: Thu, 28 Jun 2018 20:44:57 +0900
Subject: fix but failed

---
 src/shared/settings/values.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/shared/settings/values.js')

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,
-- 
cgit v1.2.3