gearheads
/
mastodon
Archived
2
0
Fork 0
Code Releases 4 Activity

Remove auto-redirect to direct messages in web UI (#15142)

gh/stable
Eugen Rochko 2020-11-11 05:36:22 +01:00 committed by GitHub
parent 462fb5451d
commit f1858f08c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -152,9 +152,7 @@ export function submitCompose(routerHistory) {
'Idempotency-Key': getState().getIn(['compose', 'idempotencyKey']), 'Idempotency-Key': getState().getIn(['compose', 'idempotencyKey']),
}, },
}).then(function (response) { }).then(function (response) {
if (response.data.visibility === 'direct' && getState().getIn(['conversations', 'mounted']) <= 0 && routerHistory) { if (routerHistory && routerHistory.location.pathname === '/statuses/new' && window.history.state) {
routerHistory.push('/timelines/direct');
} else if (routerHistory && routerHistory.location.pathname === '/statuses/new' && window.history.state) {
routerHistory.goBack(); routerHistory.goBack();
} }