diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2018-10-24 01:31:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-24 01:31:31 +0200 |
| commit | 01c169e796c4d8dd47526fcb07cb6cee1f034d9f (patch) | |
| tree | 7c6e1066da529ae229cedfe635a72860295ffb6e /app/javascript | |
| parent | e3a1955276cb12e8eb57ede30bd1376f5a875310 (diff) | |
Fix JS error when posting from page without router context (#9073)
Fix #9057
Diffstat (limited to 'app/javascript')
| -rw-r--r-- | app/javascript/mastodon/actions/compose.js | 2 | ||||
| -rw-r--r-- | app/javascript/mastodon/features/compose/components/compose_form.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/javascript/mastodon/actions/compose.js b/app/javascript/mastodon/actions/compose.js index fac8d32a1..86d83122f 100644 --- a/app/javascript/mastodon/actions/compose.js +++ b/app/javascript/mastodon/actions/compose.js @@ -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'); } else if (response.data.visibility !== 'direct') { insertIfOnline('home'); diff --git a/app/javascript/mastodon/features/compose/components/compose_form.js b/app/javascript/mastodon/features/compose/components/compose_form.js index 27178fe19..0625ab223 100644 --- a/app/javascript/mastodon/features/compose/components/compose_form.js +++ b/app/javascript/mastodon/features/compose/components/compose_form.js @@ -88,7 +88,7 @@ class ComposeForm extends ImmutablePureComponent { return; } - this.props.onSubmit(this.context.router.history); + this.props.onSubmit(this.context.router ? this.context.router.history : null); } onSuggestionsClearRequested = () => { |