Merge pull request #423 from ueokande/greenkeeper/eslint-5.0.1

Update eslint

2 files changed, 4 insertions, 5 deletions

diff --git a/src/content/actions/operation.js b/src/content/actions/operation.js
index 9171766..40ac52d 100644
--- a/src/content/actions/operation.js
+++ b/src/content/actions/operation.js
@@ -8,7 +8,7 @@ import * as consoleFrames from 'content/console-frames';
 import * as addonActions from './addon';
 import * as properties from 'shared/settings/properties';
 
-// eslint-disable-next-line complexity
+// eslint-disable-next-line complexity, max-lines-per-function
 const exec = (operation, repeat, settings) => {
   let smoothscroll = settings.properties.smoothscroll ||
     properties.defaults.smoothscroll;
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, }
   };
 };