about summary refs log tree commit diff
path: root/app/javascript/mastodon/features/public_timeline/index.js
diff options
context:
space:
mode:
authorunarist <m.unarist@gmail.com>2017-06-05 22:20:46 +0900
committerEugen Rochko <eugen@zeonfederated.com>2017-06-05 15:20:46 +0200
commitc26cea262b7673b0b239dd1da6754e7788aa08d8 (patch)
tree5aeaca51ded65d0ce3c2c9a6f12e028fccae214b /app/javascript/mastodon/features/public_timeline/index.js
parent1f1d6bf2a07219c9dfd04db5b98e31a0543a7427 (diff)
Prevent pinned columns from scroll to top on URL changing (#3586)
Diffstat (limited to 'app/javascript/mastodon/features/public_timeline/index.js')
-rw-r--r--app/javascript/mastodon/features/public_timeline/index.js1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/javascript/mastodon/features/public_timeline/index.js b/app/javascript/mastodon/features/public_timeline/index.js
index 001632004..988e5a059 100644
--- a/app/javascript/mastodon/features/public_timeline/index.js
+++ b/app/javascript/mastodon/features/public_timeline/index.js
@@ -125,6 +125,7 @@ class PublicTimeline extends React.PureComponent {
         <StatusListContainer
           {...this.props}
           type='public'
+          trackScroll={!pinned}
           scrollKey={`public_timeline-${columnId}`}
           emptyMessage={<FormattedMessage id='empty_column.public' defaultMessage='There is nothing here! Write something publicly, or manually follow users from other instances to fill it up' />}
         />