about summary refs log tree commit diff
path: root/app/javascript/flavours
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2018-05-29 16:40:04 +0200
committerThibG <thib@sitedethib.com>2018-12-18 21:39:35 +0100
commit9fc7ad7b9ce663a9daff9fdd4d934c101f6e38c0 (patch)
tree06d7234b518bd46e0d9ce0d5a8dd9a5fb532b75e /app/javascript/flavours
parentc644e6ea898413a35c5bd69bf49b872f605151dc (diff)
[Glitch] Always display tab navigation on local/federated timeline even when empty
Port 90b64c006998ec3bae365007781c61e8a79eeeef to glitch-soc
Diffstat (limited to 'app/javascript/flavours')
-rw-r--r--app/javascript/flavours/glitch/components/status_list.js2
-rw-r--r--app/javascript/flavours/glitch/features/community_timeline/index.js1
-rw-r--r--app/javascript/flavours/glitch/features/public_timeline/index.js1
3 files changed, 3 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/components/status_list.js b/app/javascript/flavours/glitch/components/status_list.js
index 5249af76d..a7629bd54 100644
--- a/app/javascript/flavours/glitch/components/status_list.js
+++ b/app/javascript/flavours/glitch/components/status_list.js
@@ -25,7 +25,7 @@ export default class StatusList extends ImmutablePureComponent {
     prepend: PropTypes.node,
     alwaysPrepend: PropTypes.bool,
     emptyMessage: PropTypes.node,
-    timelineId: PropTypes.string,
+    timelineId: PropTypes.string.isRequired,
   };
 
   static defaultProps = {
diff --git a/app/javascript/flavours/glitch/features/community_timeline/index.js b/app/javascript/flavours/glitch/features/community_timeline/index.js
index dd9b622ee..dc52aef88 100644
--- a/app/javascript/flavours/glitch/features/community_timeline/index.js
+++ b/app/javascript/flavours/glitch/features/community_timeline/index.js
@@ -131,6 +131,7 @@ export default class CommunityTimeline extends React.PureComponent {
 
         <StatusListContainer
           prepend={headline}
+          alwaysPrepend
           trackScroll={!pinned}
           scrollKey={`community_timeline-${columnId}`}
           shouldUpdateScroll={this.shouldUpdateScroll}
diff --git a/app/javascript/flavours/glitch/features/public_timeline/index.js b/app/javascript/flavours/glitch/features/public_timeline/index.js
index 03bcc589c..345d5efc3 100644
--- a/app/javascript/flavours/glitch/features/public_timeline/index.js
+++ b/app/javascript/flavours/glitch/features/public_timeline/index.js
@@ -131,6 +131,7 @@ export default class PublicTimeline extends React.PureComponent {
 
         <StatusListContainer
           prepend={headline}
+          alwaysPrepend
           timelineId={`public${onlyMedia ? ':media' : ''}`}
           onLoadMore={this.handleLoadMore}
           trackScroll={!pinned}