chinwag/chinwagsocial
chinwag/chinwagsocial
2
0
Fork 0
Code Issues Pull requests Releases 4 Wiki Activity

Always display tab navigation on local/federated timeline even when empty (#7663)

Browse source 
Fix #7659
This commit is contained in:
Eugen Rochko 2018-05-29 02:01:04 +02:00 committed by GitHub
parent e599d7caf2
commit 90b64c0069
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/javascript/mastodon/components/scrollable_list.js
View file

@ -25,6 +25,7 @@ export default class ScrollableList extends PureComponent {
isLoading: PropTypes.bool,
hasMore: PropTypes.bool,
prepend: PropTypes.node,
alwaysPrepend: PropTypes.bool,
emptyMessage: PropTypes.node,
children: PropTypes.node,
};
@ -140,7 +141,7 @@ export default class ScrollableList extends PureComponent {
}
render () {
const { children, scrollKey, trackScroll, shouldUpdateScroll, isLoading, hasMore, prepend, emptyMessage, onLoadMore } = this.props;
const { children, scrollKey, trackScroll, shouldUpdateScroll, isLoading, hasMore, prepend, alwaysPrepend, emptyMessage, onLoadMore } = this.props;
const { fullscreen } = this.state;
const childrenCount = React.Children.count(children);
@ -172,9 +173,13 @@ export default class ScrollableList extends PureComponent {
);
} else {
scrollableArea = (
<div style={{ flex: '1 1 auto', display: 'flex', flexDirection: 'column' }}>
{alwaysPrepend && prepend}
<div className='empty-column-indicator' ref={this.setRef}>
{emptyMessage}
</div>
</div>
);
}

1
app/javascript/mastodon/components/status_list.js
View file

@ -24,6 +24,7 @@ export default class StatusList extends ImmutablePureComponent {
hasMore: PropTypes.bool,
prepend: PropTypes.node,
emptyMessage: PropTypes.node,
alwaysPrepend: PropTypes.bool,
};
static defaultProps = {

1
app/javascript/mastodon/features/community_timeline/index.js
View file

@ -127,6 +127,7 @@ export default class CommunityTimeline extends React.PureComponent {
<StatusListContainer
prepend={headline}
alwaysPrepend
trackScroll={!pinned}
scrollKey={`community_timeline-${columnId}`}
timelineId={`community${onlyMedia ? ':media' : ''}`}

1
app/javascript/mastodon/features/public_timeline/index.js
View file

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