diff options
Diffstat (limited to 'src/reducers')
-rw-r--r-- | src/reducers/index.js | 7 | ||||
-rw-r--r-- | src/reducers/input.js | 6 |
2 files changed, 5 insertions, 8 deletions
diff --git a/src/reducers/index.js b/src/reducers/index.js index 83a9a56..9beb81c 100644 --- a/src/reducers/index.js +++ b/src/reducers/index.js @@ -1,14 +1,17 @@ import inputReducer from '../reducers/input'; import consoleReducer from '../reducers/console'; +import settingReducer from '../reducers/setting'; const defaultState = { input: inputReducer(undefined, {}), - console: consoleReducer(undefined, {}) + console: consoleReducer(undefined, {}), + setting: settingReducer(undefined, {}), }; export default function reducer(state = defaultState, action = {}) { return Object.assign({}, state, { input: inputReducer(state.input, action), - console: consoleReducer(state.console, action) + console: consoleReducer(state.console, action), + setting: settingReducer(state.setting, action), }); } diff --git a/src/reducers/input.js b/src/reducers/input.js index dca26e2..eb7ff24 100644 --- a/src/reducers/input.js +++ b/src/reducers/input.js @@ -2,7 +2,6 @@ import actions from '../actions'; const defaultState = { keys: [], - keymaps: {} }; export default function reducer(state = defaultState, action = {}) { @@ -20,11 +19,6 @@ export default function reducer(state = defaultState, action = {}) { return Object.assign({}, state, { keys: [], }); - case actions.INPUT_SET_KEYMAPS: - return Object.assign({}, state, { - keymaps: action.keymaps, - keys: [], - }); default: return state; } |