aboutsummaryrefslogtreecommitdiff
path: root/src/background/reducers/index.js
diff options
context:
space:
mode:
authorShin'ya Ueoka <ueokande@i-beam.org>2018-06-28 21:41:34 +0900
committerGitHub <noreply@github.com>2018-06-28 21:41:34 +0900
commitd0c23587f8ee8c1bca38f036ae8f71078d6ca937 (patch)
tree2c5cb4aea22de3de6360220a6291440c7ac18230 /src/background/reducers/index.js
parent6d0732eb80f2a2b2546e659662537bf4e40d7e5c (diff)
parent05faaced137eb3a48780806fded04fd76bd9a84e (diff)
Merge pull request #423 from ueokande/greenkeeper/eslint-5.0.1
Update eslint
Diffstat (limited to 'src/background/reducers/index.js')
-rw-r--r--src/background/reducers/index.js5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/background/reducers/index.js b/src/background/reducers/index.js
index 5729f0a..78f855c 100644
--- a/src/background/reducers/index.js
+++ b/src/background/reducers/index.js
@@ -10,9 +10,8 @@ const defaultState = {
};
export default function reducer(state = defaultState, action = {}) {
- return Object.assign({}, state, {
+ return { ...state,
setting: settingReducer(state.setting, action),
find: findReducer(state.find, action),
- tab: tabReducer(state.tab, action),
- });
+ tab: tabReducer(state.tab, action), };
}