aboutsummaryrefslogtreecommitdiff
path: root/src/reducers
diff options
context:
space:
mode:
authorShin'ya Ueoka <ueokande@i-beam.org>2017-10-04 22:01:16 +0900
committerShin'ya Ueoka <ueokande@i-beam.org>2017-10-04 22:01:16 +0900
commit79a4a805f6be14572b4486ddb79b0ebb98e37690 (patch)
tree839dea5d9ed0654693c307c72dc3c75ebbe12a86 /src/reducers
parent6594841b1d1f082107bdb1489f02d3c99cff8ffa (diff)
single reducer
Diffstat (limited to 'src/reducers')
-rw-r--r--src/reducers/completion.js2
-rw-r--r--src/reducers/index.js6
2 files changed, 7 insertions, 1 deletions
diff --git a/src/reducers/completion.js b/src/reducers/completion.js
index a8a6444..878aeac 100644
--- a/src/reducers/completion.js
+++ b/src/reducers/completion.js
@@ -63,6 +63,6 @@ export default function reducer(state = defaultState, action = {}) {
});
}
default:
- return defaultState;
+ return state;
}
}
diff --git a/src/reducers/index.js b/src/reducers/index.js
index 9beb81c..db17edf 100644
--- a/src/reducers/index.js
+++ b/src/reducers/index.js
@@ -1,11 +1,15 @@
import inputReducer from '../reducers/input';
import consoleReducer from '../reducers/console';
import settingReducer from '../reducers/setting';
+import followReducer from '../reducers/follow';
+import completionReducer from '../reducers/completion';
const defaultState = {
input: inputReducer(undefined, {}),
console: consoleReducer(undefined, {}),
setting: settingReducer(undefined, {}),
+ follow: followReducer(undefined, {}),
+ completion: completionReducer(undefined, {}),
};
export default function reducer(state = defaultState, action = {}) {
@@ -13,5 +17,7 @@ export default function reducer(state = defaultState, action = {}) {
input: inputReducer(state.input, action),
console: consoleReducer(state.console, action),
setting: settingReducer(state.setting, action),
+ follow: followReducer(state.follow, action),
+ completion: completionReducer(state.completion, action),
});
}