diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-11-09 16:47:50 +0100 |
---|---|---|
committer | ThibG <thib@sitedethib.com> | 2018-11-13 15:54:04 +0100 |
commit | 5ebbaffaa308d4e0496f99321bbaeb1205bb8930 (patch) | |
tree | c68fe11c39d26e6e5d54dfd6b59f54db6519f83a /app/javascript/flavours/glitch/components/status_list.js | |
parent | c5a4dc91189138ba0ce26a12cf23f1c1f16a106b (diff) |
[Glitch] Use local instead of global loading indicator for timelines, account timelines
Port dd00cd19d2536ce70442d74d72986721427691a5 to glitch-soc
Diffstat (limited to 'app/javascript/flavours/glitch/components/status_list.js')
-rw-r--r-- | app/javascript/flavours/glitch/components/status_list.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/javascript/flavours/glitch/components/status_list.js b/app/javascript/flavours/glitch/components/status_list.js index aa902db47..d13bd72f6 100644 --- a/app/javascript/flavours/glitch/components/status_list.js +++ b/app/javascript/flavours/glitch/components/status_list.js @@ -24,7 +24,7 @@ export default class StatusList extends ImmutablePureComponent { hasMore: PropTypes.bool, prepend: PropTypes.node, emptyMessage: PropTypes.node, - timelineId: PropTypes.string.isRequired, + timelineId: PropTypes.string, }; static defaultProps = { @@ -121,7 +121,7 @@ export default class StatusList extends ImmutablePureComponent { } return ( - <ScrollableList {...other} onLoadMore={onLoadMore && this.handleLoadOlder} ref={this.setRef}> + <ScrollableList {...other} showLoading={isLoading && statusIds.size === 0} onLoadMore={onLoadMore && this.handleLoadOlder} ref={this.setRef}> {scrollableContent} </ScrollableList> ); |