diff options
author | ThibG <thib@sitedethib.com> | 2019-08-06 17:25:54 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-06 17:25:54 +0200 |
commit | 8400ddca7155005ab79485ed6054c04ea3ca5667 (patch) | |
tree | 696f5ae9a70891e96fdf819905b05aa6482bcf07 /app/javascript/flavours/glitch/reducers | |
parent | 3ea7a334d89d2c4075b1dbf649d692ff49325f2e (diff) | |
parent | d10f6036cfeebec5b2c160db8659d2c19d29fe9c (diff) |
Merge pull request #1191 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/reducers')
-rw-r--r-- | app/javascript/flavours/glitch/reducers/modal.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/reducers/modal.js b/app/javascript/flavours/glitch/reducers/modal.js index 80bc11dda..7bd9d4b32 100644 --- a/app/javascript/flavours/glitch/reducers/modal.js +++ b/app/javascript/flavours/glitch/reducers/modal.js @@ -10,7 +10,7 @@ export default function modal(state = initialState, action) { case MODAL_OPEN: return { modalType: action.modalType, modalProps: action.modalProps }; case MODAL_CLOSE: - return initialState; + return (action.modalType === undefined || action.modalType === state.modalType) ? initialState : state; default: return state; } |