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/storage.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

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

diff --git a/src/shared/settings/storage.js b/src/shared/settings/storage.js
index 87843ed..5dce3b0 100644
--- a/src/shared/settings/storage.js
+++ b/src/shared/settings/storage.js
@@ -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) => {
-- 
cgit v1.2.3