tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not push DMs into the home feed (#8940)

Browse Source 
* Do not push DMs into the home feed

* Show DMs column after sending a DM, if DMs column is not already shown
This commit is contained in:
Eugen Rochko
2018-10-11 01:31:03 +02:00
committed by GitHub
parent 790d3bc637
commit 87fdd139b8
11 changed files with 52 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,6 +30,10 @@ const messages = defineMessages({
export default @injectIntl
class ComposeForm extends ImmutablePureComponent {
static contextTypes = {
router: PropTypes.object,
};
static propTypes = {
intl: PropTypes.object.isRequired,
text: PropTypes.string.isRequired,
@ -84,7 +88,7 @@ class ComposeForm extends ImmutablePureComponent {
return;
}
this.props.onSubmit();
this.props.onSubmit(this.context.router.history);
}
onSuggestionsClearRequested = () => {

6
app/javascript/mastodon/features/compose/components/upload.js
View File

@ -14,6 +14,10 @@ const messages = defineMessages({
export default @injectIntl
class Upload extends ImmutablePureComponent {
static contextTypes = {
router: PropTypes.object,
};
static propTypes = {
media: ImmutablePropTypes.map.isRequired,
intl: PropTypes.object.isRequired,
@ -37,7 +41,7 @@ class Upload extends ImmutablePureComponent {
handleSubmit = () => {
this.handleInputBlur();
this.props.onSubmit();
this.props.onSubmit(this.context.router.history);
}
handleUndoClick = () => {