ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Glitch] Always display tab navigation on local/federated timeline even when empty 

Port 90b64c0069 to glitch-soc
rebase/4.0.0rc2
Thibaut Girka 2018-05-29 16:40:04 +02:00 committed by ThibG
parent c644e6ea89
commit 9fc7ad7b9c
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/flavours/glitch/components/status_list.js
View File

@ -25,7 +25,7 @@ export default class StatusList extends ImmutablePureComponent {
prepend: PropTypes.node, prepend: PropTypes.node,
alwaysPrepend: PropTypes.bool, alwaysPrepend: PropTypes.bool,
emptyMessage: PropTypes.node, emptyMessage: PropTypes.node,
timelineId: PropTypes.string, timelineId: PropTypes.string.isRequired,
}; };
static defaultProps = { static defaultProps = {

1
app/javascript/flavours/glitch/features/community_timeline/index.js
View File

@ -131,6 +131,7 @@ export default class CommunityTimeline extends React.PureComponent {
<StatusListContainer <StatusListContainer
prepend={headline} prepend={headline}
alwaysPrepend
trackScroll={!pinned} trackScroll={!pinned}
scrollKey={`community_timeline-${columnId}`} scrollKey={`community_timeline-${columnId}`}
shouldUpdateScroll={this.shouldUpdateScroll} shouldUpdateScroll={this.shouldUpdateScroll}

1
app/javascript/flavours/glitch/features/public_timeline/index.js
View File

@ -131,6 +131,7 @@ export default class PublicTimeline extends React.PureComponent {
<StatusListContainer <StatusListContainer
prepend={headline} prepend={headline}
alwaysPrepend
timelineId={`public${onlyMedia ? ':media' : ''}`} timelineId={`public${onlyMedia ? ':media' : ''}`}
onLoadMore={this.handleLoadMore} onLoadMore={this.handleLoadMore}
trackScroll={!pinned} trackScroll={!pinned}