diff options
Diffstat (limited to 'app/javascript/mastodon/features/public_timeline/index.js')
-rw-r--r-- | app/javascript/mastodon/features/public_timeline/index.js | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/app/javascript/mastodon/features/public_timeline/index.js b/app/javascript/mastodon/features/public_timeline/index.js index 2fce4d581..15cc3e31d 100644 --- a/app/javascript/mastodon/features/public_timeline/index.js +++ b/app/javascript/mastodon/features/public_timeline/index.js @@ -8,7 +8,7 @@ import ColumnHeader from '../../components/column_header'; import { expandPublicTimeline } from '../../actions/timelines'; import { addColumn, removeColumn, moveColumn, changeColumnParams } from '../../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 '../../actions/streaming'; const messages = defineMessages({ @@ -100,17 +100,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}> @@ -128,7 +126,7 @@ export default class PublicTimeline extends React.PureComponent { </ColumnHeader> <StatusListContainer - // prepend={headline} + prepend={headline} timelineId={`public${onlyMedia ? ':media' : ''}`} onLoadMore={this.handleLoadMore} trackScroll={!pinned} |