cybrespace
/
mastodon
4
3
Fork 3
Code Issues 7 Pull Requests Releases Activity

Check if router is injected in media modal (#7941)

This commit is contained in:
Maciek Baron 2018-07-04 14:34:28 +01:00 committed by Eugen Rochko
parent 9dc413b025
commit f3af1a96a8
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/javascript/mastodon/features/ui/components/media_modal.js
View File

@ -67,19 +67,23 @@ export default class MediaModal extends ImmutablePureComponent {
componentDidMount () { componentDidMount () {
window.addEventListener('keyup', this.handleKeyUp, false); window.addEventListener('keyup', this.handleKeyUp, false);
const history = this.context.router.history; if (this.context.router) {
history.push(history.location.pathname, previewState); const history = this.context.router.history;
this.unlistenHistory = history.listen(() => { history.push(history.location.pathname, previewState);
this.props.onClose(); this.unlistenHistory = history.listen(() => {
}); this.props.onClose();
});
}
} }
componentWillUnmount () { componentWillUnmount () {
window.removeEventListener('keyup', this.handleKeyUp); window.removeEventListener('keyup', this.handleKeyUp);
this.unlistenHistory(); if (this.context.router) {
this.unlistenHistory();
if (this.context.router.history.location.state === previewState) { if (this.context.router.history.location.state === previewState) {
this.context.router.history.goBack(); this.context.router.history.goBack();
}
} }
} }