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

Merge branch 'main' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Claire
2023-06-27 13:15:41 +02:00
parent b052a7ed95 c7c6f02ae6
commit 80a5c16ae1
14 changed files with 287 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -129,13 +129,13 @@ export function resetCompose() {
};
}
export const focusCompose = (routerHistory, defaultText) => dispatch => {
export const focusCompose = (routerHistory, defaultText) => (dispatch, getState) => {
dispatch({
type: COMPOSE_FOCUS,
defaultText,
});
ensureComposeIsVisible(routerHistory);
ensureComposeIsVisible(getState, routerHistory);
};
export function mentionCompose(account, routerHistory) {