diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2018-05-27 21:45:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-27 21:45:30 +0200 |
| commit | 9bd23dc4e51ba47283a8e3a66cd94b4e624a5235 (patch) | |
| tree | 119802887a7b894ea3aac5e28a8a7a15524c1c35 /app/javascript/mastodon/features/compose/index.js | |
| parent | 63c7b9157274f57c496399a1a5c728b32415034c (diff) | |
Track trending tags (#7638)
* Track trending tags - Half-life of 1 day - Historical usage in daily buckets (last 7 days stored) - GET /api/v1/trends Fix #271 * Add trends to web UI * Don't render compose form on search route, adjust search results header * Disqualify tag from trends if it's in disallowed hashtags setting * Count distinct accounts using tag, ignore silenced accounts
Diffstat (limited to 'app/javascript/mastodon/features/compose/index.js')
| -rw-r--r-- | app/javascript/mastodon/features/compose/index.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/javascript/mastodon/features/compose/index.js b/app/javascript/mastodon/features/compose/index.js index 19aae0332..d8e9ad9ee 100644 --- a/app/javascript/mastodon/features/compose/index.js +++ b/app/javascript/mastodon/features/compose/index.js @@ -101,7 +101,7 @@ export default class Compose extends React.PureComponent { {(multiColumn || isSearchPage) && <SearchContainer /> } <div className='drawer__pager'> - <div className='drawer__inner' onFocus={this.onFocus}> + {!isSearchPage && <div className='drawer__inner' onFocus={this.onFocus}> <NavigationContainer onClose={this.onBlur} /> <ComposeFormContainer /> {multiColumn && ( @@ -109,7 +109,7 @@ export default class Compose extends React.PureComponent { <img alt='' draggable='false' src={elephantUIPlane} /> </div> )} - </div> + </div>} <Motion defaultStyle={{ x: isSearchPage ? 0 : -100 }} style={{ x: spring(showSearch || isSearchPage ? 0 : -100, { stiffness: 210, damping: 20 }) }}> {({ x }) => ( |