diff options
author | kaias1jp <kaias1jp@gmail.com> | 2021-02-12 03:59:47 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-11 19:59:47 +0100 |
commit | 08ae116dc62c51988e9710b4f0cc9fdb2e9557b9 (patch) | |
tree | 5d402a1d9bd2f6c572536d00b4bccae7b18de754 /app | |
parent | 01e44b886dd03722507da3a799967ba2cab714ad (diff) |
Fixed WebUI crash when a status opened in the media modal is deleted (#15701)
* Fixed picture in picture compatibility error in WebUI when status is deleted * Revert "Fixed picture in picture compatibility error in WebUI when status is deleted" This reverts commit f003b7d9d88688e9504f7dfae1545d7522fcfd98. * Close the modal display of the image when status is deleted * Fixed the case statement before the default statement * Removed unnecessary parts
Diffstat (limited to 'app')
-rw-r--r-- | app/javascript/mastodon/reducers/modal.js | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/javascript/mastodon/reducers/modal.js b/app/javascript/mastodon/reducers/modal.js index a30da2db1..cb53887c7 100644 --- a/app/javascript/mastodon/reducers/modal.js +++ b/app/javascript/mastodon/reducers/modal.js @@ -1,4 +1,5 @@ import { MODAL_OPEN, MODAL_CLOSE } from '../actions/modal'; +import { TIMELINE_DELETE } from '../actions/timelines'; const initialState = { modalType: null, @@ -11,6 +12,8 @@ export default function modal(state = initialState, action) { return { modalType: action.modalType, modalProps: action.modalProps }; case MODAL_CLOSE: return (action.modalType === undefined || action.modalType === state.modalType) ? initialState : state; + case TIMELINE_DELETE: + return (state.modalProps.statusId === action.id) ? initialState : state; default: return state; } |