Skip to content

Commit

Permalink
Fixed WebUI crash when a status opened in the media modal is deleted (#…
Browse files Browse the repository at this point in the history
…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 f003b7d.

* Close the modal display of the image when status is deleted

* Fixed the case statement before the default statement

* Removed unnecessary parts
  • Loading branch information
kaias1jp authored Feb 11, 2021
1 parent 01e44b8 commit 08ae116
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions app/javascript/mastodon/reducers/modal.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { MODAL_OPEN, MODAL_CLOSE } from '../actions/modal';
import { TIMELINE_DELETE } from '../actions/timelines';

const initialState = {
modalType: null,
Expand All @@ -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;
}
Expand Down

0 comments on commit 08ae116

Please sign in to comment.