From 01c169e796c4d8dd47526fcb07cb6cee1f034d9f Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 24 Oct 2018 01:31:31 +0200
Subject: [PATCH] Fix JS error when posting from page without router context
(#9073)
Fix #9057
---
app/javascript/mastodon/actions/compose.js | 2 +-
.../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 fac8d32a12..86d83122fc 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 27178fe198..0625ab2232 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 = () => {