diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-06-16 21:09:19 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-06-16 21:09:19 +0200 |
commit | 5717f75340dacc4d08fa1e8698af7f4413c20993 (patch) | |
tree | 103e4dbb4ef5a831e34a523aa959d62417827f97 /app/javascript | |
parent | d3aaacb6d48ab815a79cc4feb6b2c9a1ffc41717 (diff) | |
parent | 65efe892cf56cd4f998de885bccc36e9231d8144 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/javascript')
-rw-r--r-- | app/javascript/mastodon/features/compose/components/compose_form.js | 3 | ||||
-rw-r--r-- | app/javascript/mastodon/features/ui/components/compose_panel.js | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/javascript/mastodon/features/compose/components/compose_form.js b/app/javascript/mastodon/features/compose/components/compose_form.js index c31e10be9..b3a04e421 100644 --- a/app/javascript/mastodon/features/compose/components/compose_form.js +++ b/app/javascript/mastodon/features/compose/components/compose_form.js @@ -61,6 +61,7 @@ class ComposeForm extends ImmutablePureComponent { onPickEmoji: PropTypes.func.isRequired, showSearch: PropTypes.bool, anyMedia: PropTypes.bool, + singleColumn: PropTypes.bool, }; static defaultProps = { @@ -116,7 +117,7 @@ class ComposeForm extends ImmutablePureComponent { } handleFocus = () => { - if (this.composeForm) { + if (this.composeForm && !this.props.singleColumn) { this.composeForm.scrollIntoView(); } } diff --git a/app/javascript/mastodon/features/ui/components/compose_panel.js b/app/javascript/mastodon/features/ui/components/compose_panel.js index a05fbbe39..c7821f473 100644 --- a/app/javascript/mastodon/features/ui/components/compose_panel.js +++ b/app/javascript/mastodon/features/ui/components/compose_panel.js @@ -8,7 +8,7 @@ const ComposePanel = () => ( <div className='compose-panel'> <SearchContainer openInRoute /> <NavigationContainer /> - <ComposeFormContainer /> + <ComposeFormContainer singleColumn /> <LinkFooter withHotkeys /> </div> ); |