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

Fix JS error when posting from page without router context (#9073) 

Fix #9057
This commit is contained in:
Eugen Rochko 2018-10-24 01:31:31 +02:00 committed by GitHub
parent e3a1955276
commit 01c169e796
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/mastodon/actions/compose.js
View File

@ -142,7 +142,7 @@ export function submitCompose(routerHistory) {
} }
}; };
if (response.data.visibility === 'direct' && getState().getIn(['conversations', 'mounted']) <= 0) { if (response.data.visibility === 'direct' && getState().getIn(['conversations', 'mounted']) <= 0 && routerHistory) {
routerHistory.push('/timelines/direct'); routerHistory.push('/timelines/direct');
} else if (response.data.visibility !== 'direct') { } else if (response.data.visibility !== 'direct') {
insertIfOnline('home'); insertIfOnline('home');

2
app/javascript/mastodon/features/compose/components/compose_form.js
View File

@ -88,7 +88,7 @@ class ComposeForm extends ImmutablePureComponent {
return; return;
} }
this.props.onSubmit(this.context.router.history); this.props.onSubmit(this.context.router ? this.context.router.history : null);
} }
onSuggestionsClearRequested = () => { onSuggestionsClearRequested = () => {