diff options
author | ThibG <thib@sitedethib.com> | 2019-06-28 19:11:06 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-28 19:11:06 +0200 |
commit | f7c0e326ab11a597b17a22dd8889f0690d7ffd73 (patch) | |
tree | ac3ecf0c5bb88485d343752b52f521fd71de8fa6 /app/javascript/flavours/glitch/reducers/search.js | |
parent | 6ad870a410c7379eb8f3e719f3ad217354691546 (diff) | |
parent | 43698e08cad195df6f85aea26c710c2e1614a4a3 (diff) |
Merge pull request #1145 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/reducers/search.js')
-rw-r--r-- | app/javascript/flavours/glitch/reducers/search.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/reducers/search.js b/app/javascript/flavours/glitch/reducers/search.js index 9a525bf47..1c32a5b9f 100644 --- a/app/javascript/flavours/glitch/reducers/search.js +++ b/app/javascript/flavours/glitch/reducers/search.js @@ -16,6 +16,7 @@ const initialState = ImmutableMap({ submitted: false, hidden: false, results: ImmutableMap(), + searchTerm: '', }); export default function search(state = initialState, action) { @@ -40,7 +41,7 @@ export default function search(state = initialState, action) { accounts: ImmutableList(action.results.accounts.map(item => item.id)), statuses: ImmutableList(action.results.statuses.map(item => item.id)), hashtags: fromJS(action.results.hashtags), - })).set('submitted', true); + })).set('submitted', true).set('searchTerm', action.searchTerm); default: return state; } |