diff options
| author | Shin'ya Ueoka <ueokande@i-beam.org> | 2018-05-01 15:51:40 +0900 |
|---|---|---|
| committer | Shin'ya Ueoka <ueokande@i-beam.org> | 2018-05-01 15:51:40 +0900 |
| commit | 9da2f5fd786ff7ef64eca0a86efb1c0b9a164244 (patch) | |
| tree | b888349817d0016dc1499932671bbe6cd95efdaa /src/content/reducers | |
| parent | f9889b7f2b634bfe5a540633d8952f4a6f900658 (diff) | |
| parent | 89d6afecfd257ff4fc62748f771abf37ef3a2852 (diff) | |
Merge remote-tracking branch 'origin/master' into patch-1
Diffstat (limited to 'src/content/reducers')
| -rw-r--r-- | src/content/reducers/find.js | 2 | ||||
| -rw-r--r-- | src/content/reducers/follow-controller.js | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/content/reducers/find.js b/src/content/reducers/find.js index eb43c37..8d63ee5 100644 --- a/src/content/reducers/find.js +++ b/src/content/reducers/find.js @@ -1,7 +1,7 @@ import actions from 'content/actions'; const defaultState = { - keyword: '', + keyword: null, found: false, }; diff --git a/src/content/reducers/follow-controller.js b/src/content/reducers/follow-controller.js index 2afb232..78fd848 100644 --- a/src/content/reducers/follow-controller.js +++ b/src/content/reducers/follow-controller.js @@ -3,6 +3,7 @@ import actions from 'content/actions'; const defaultState = { enabled: false, newTab: false, + background: false, keys: '', }; @@ -12,6 +13,7 @@ export default function reducer(state = defaultState, action = {}) { return Object.assign({}, state, { enabled: true, newTab: action.newTab, + background: action.background, keys: '', }); case actions.FOLLOW_CONTROLLER_DISABLE: |