aboutsummaryrefslogtreecommitdiff
path: root/src/content/actions/setting.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/content/actions/setting.js
parent03cf265eff0f4866959369531c2a1f5a5a0684b7 (diff)
fix but failed
Diffstat (limited to 'src/content/actions/setting.js')
-rw-r--r--src/content/actions/setting.js7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/content/actions/setting.js b/src/content/actions/setting.js
index 4c1e385..e34b6e0 100644
--- a/src/content/actions/setting.js
+++ b/src/content/actions/setting.js
@@ -10,7 +10,7 @@ const reservedKeymaps = {
const set = (value) => {
let entries = [];
if (value.keymaps) {
- let keymaps = Object.assign({}, value.keymaps, reservedKeymaps);
+ let keymaps = { ...value.keymaps, ...reservedKeymaps };
entries = Object.entries(keymaps).map((entry) => {
return [
keyUtils.fromMapKeys(entry[0]),
@@ -21,9 +21,8 @@ const set = (value) => {
return {
type: actions.SETTING_SET,
- value: Object.assign({}, value, {
- keymaps: entries,
- })
+ value: { ...value,
+ keymaps: entries, }
};
};