diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-04-20 21:28:03 +0200 |
---|---|---|
committer | ThibG <thib@sitedethib.com> | 2019-04-22 20:15:47 +0200 |
commit | 1bc4b8a0a57a4046364f4afbb741f2d4e7d48dcb (patch) | |
tree | d692e04c561eabbe53135381e372accb8b3c3678 /app/javascript/flavours/glitch/features/compose/index.js | |
parent | 281a82d8784fec7e79e309095cbe61428173b44f (diff) |
features/composer/index.js → ComposeForm
Diffstat (limited to 'app/javascript/flavours/glitch/features/compose/index.js')
-rw-r--r-- | app/javascript/flavours/glitch/features/compose/index.js | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/javascript/flavours/glitch/features/compose/index.js b/app/javascript/flavours/glitch/features/compose/index.js index 923d379ec..01e7d1906 100644 --- a/app/javascript/flavours/glitch/features/compose/index.js +++ b/app/javascript/flavours/glitch/features/compose/index.js @@ -10,7 +10,7 @@ import classNames from 'classnames'; import { cycleElefriendCompose } from 'flavours/glitch/actions/compose'; // Components. -import Composer from 'flavours/glitch/features/composer'; +import ComposeFormContainer from './containers/compose_form_container'; import HeaderContainer from './containers/header_container'; import SearchContainer from './containers/search_container'; import SearchResultsContainer from './containers/search_results_container'; @@ -73,11 +73,13 @@ class Compose extends React.PureComponent { return ( <div className={computedClass} role='region' aria-label={intl.formatMessage(messages.compose)}> {multiColumn && <HeaderContainer />} + {(multiColumn || isSearchPage) && <SearchContainer />} + <div className='drawer__pager'> {!isSearchPage && <div className='drawer__inner'> <NavigationContainer /> - <Composer /> + <ComposeFormContainer /> {multiColumn && ( <div className='drawer__inner__mastodon'> {mascot ? <img alt='' draggable='false' src={mascot} /> : <button className='mastodon' onClick={onClickElefriend} />} @@ -96,4 +98,5 @@ class Compose extends React.PureComponent { </div> ); } + } |