diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-09-03 13:32:35 +0200 |
---|---|---|
committer | ThibG <thib@sitedethib.com> | 2018-09-03 14:24:10 +0200 |
commit | e915bc3e9e32e34bf80d1bd66ee3f80d2ca37969 (patch) | |
tree | 82d6fc6bba891d4cf75c3f4e8ea75ca516ae3e15 /app/javascript/flavours/glitch/features/standalone | |
parent | 2b82829a5351855bbf8dccdb57c8f7dbd598b6bb (diff) |
Fixes columns scrolling to top when opening media modal
Fixes #700
Diffstat (limited to 'app/javascript/flavours/glitch/features/standalone')
-rw-r--r-- | app/javascript/flavours/glitch/features/standalone/community_timeline/index.js | 5 | ||||
-rw-r--r-- | app/javascript/flavours/glitch/features/standalone/hashtag_timeline/index.js | 5 |
2 files changed, 0 insertions, 10 deletions
diff --git a/app/javascript/flavours/glitch/features/standalone/community_timeline/index.js b/app/javascript/flavours/glitch/features/standalone/community_timeline/index.js index 08b9e9e57..c488f9541 100644 --- a/app/javascript/flavours/glitch/features/standalone/community_timeline/index.js +++ b/app/javascript/flavours/glitch/features/standalone/community_timeline/index.js @@ -47,10 +47,6 @@ export default class CommunityTimeline extends React.PureComponent { this.props.dispatch(expandCommunityTimeline({ maxId })); } - shouldUpdateScroll = (prevRouterProps, { location }) => { - return !(location.state && location.state.mastodonModalOpen) - } - render () { const { intl } = this.props; @@ -66,7 +62,6 @@ export default class CommunityTimeline extends React.PureComponent { timelineId='community' onLoadMore={this.handleLoadMore} scrollKey='standalone_public_timeline' - shouldUpdateScroll={this.shouldUpdateScroll} trackScroll={false} /> </Column> diff --git a/app/javascript/flavours/glitch/features/standalone/hashtag_timeline/index.js b/app/javascript/flavours/glitch/features/standalone/hashtag_timeline/index.js index d2b1971ec..dc02f1c91 100644 --- a/app/javascript/flavours/glitch/features/standalone/hashtag_timeline/index.js +++ b/app/javascript/flavours/glitch/features/standalone/hashtag_timeline/index.js @@ -41,10 +41,6 @@ export default class HashtagTimeline extends React.PureComponent { this.props.dispatch(expandHashtagTimeline(this.props.hashtag, { maxId })); } - shouldUpdateScroll = (prevRouterProps, { location }) => { - return !(location.state && location.state.mastodonModalOpen) - } - render () { const { hashtag } = this.props; @@ -59,7 +55,6 @@ export default class HashtagTimeline extends React.PureComponent { <StatusListContainer trackScroll={false} scrollKey='standalone_hashtag_timeline' - shouldUpdateScroll={this.shouldUpdateScroll} timelineId={`hashtag:${hashtag}`} onLoadMore={this.handleLoadMore} /> |