diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-05-27 21:31:08 +0200 |
---|---|---|
committer | ThibG <thib@sitedethib.com> | 2018-12-18 21:39:35 +0100 |
commit | 200a8bdd3a63364820074563b14ab993f7549648 (patch) | |
tree | 4e47ba499f0a31ea36888f5ac4d57da39bfb267b /app/javascript/flavours/glitch/features/public_timeline | |
parent | a693d6e2f2f9e3345e502b9b7c68130780600d91 (diff) |
[Glitch] Enable media timeline
Port 8182b615183b83fb6651fb23912abda3cc4ccf03 to glitch-soc
Diffstat (limited to 'app/javascript/flavours/glitch/features/public_timeline')
-rw-r--r-- | app/javascript/flavours/glitch/features/public_timeline/index.js | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/app/javascript/flavours/glitch/features/public_timeline/index.js b/app/javascript/flavours/glitch/features/public_timeline/index.js index 6b4c835e8..03bcc589c 100644 --- a/app/javascript/flavours/glitch/features/public_timeline/index.js +++ b/app/javascript/flavours/glitch/features/public_timeline/index.js @@ -8,7 +8,7 @@ import ColumnHeader from 'flavours/glitch/components/column_header'; import { expandPublicTimeline } from 'flavours/glitch/actions/timelines'; import { addColumn, removeColumn, moveColumn, changeColumnParams } from 'flavours/glitch/actions/columns'; import ColumnSettingsContainer from './containers/column_settings_container'; -// import SectionHeadline from '../community_timeline/components/section_headline'; +import SectionHeadline from '../community_timeline/components/section_headline'; import { connectPublicStream } from 'flavours/glitch/actions/streaming'; const messages = defineMessages({ @@ -104,17 +104,15 @@ export default class PublicTimeline extends React.PureComponent { const { intl, columnId, hasUnread, multiColumn, onlyMedia } = this.props; const pinned = !!columnId; - // pending - // - // const headline = ( - // <SectionHeadline - // timelineId='public' - // to='/timelines/public' - // pinned={pinned} - // onlyMedia={onlyMedia} - // onClick={this.handleHeadlineLinkClick} - // /> - // ); + const headline = ( + <SectionHeadline + timelineId='public' + to='/timelines/public' + pinned={pinned} + onlyMedia={onlyMedia} + onClick={this.handleHeadlineLinkClick} + /> + ); return ( <Column ref={this.setRef} name='federated' label={intl.formatMessage(messages.title)}> @@ -132,7 +130,7 @@ export default class PublicTimeline extends React.PureComponent { </ColumnHeader> <StatusListContainer - // prepend={headline} + prepend={headline} timelineId={`public${onlyMedia ? ':media' : ''}`} onLoadMore={this.handleLoadMore} trackScroll={!pinned} |