diff options
| author | Reverite <github@reverite.sh> | 2019-07-22 14:48:14 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-07-22 14:48:14 -0700 |
| commit | 9148c3e8479e59df9f9a4889ef58a959f60f6606 (patch) | |
| tree | e91e1c8646fe36ec42019f65559566844c00904d /app/javascript/flavours/glitch/features/public_timeline | |
| parent | 266540080ef5659060faa7da502123f45bbc04f2 (diff) | |
| parent | 6db5669818cce459b9bb916665541b7b8f5d5155 (diff) | |
Merge branch 'glitch' into production
Diffstat (limited to 'app/javascript/flavours/glitch/features/public_timeline')
| -rw-r--r-- | app/javascript/flavours/glitch/features/public_timeline/index.js | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/app/javascript/flavours/glitch/features/public_timeline/index.js b/app/javascript/flavours/glitch/features/public_timeline/index.js index 7fe472202..e5f5171aa 100644 --- a/app/javascript/flavours/glitch/features/public_timeline/index.js +++ b/app/javascript/flavours/glitch/features/public_timeline/index.js @@ -99,10 +99,6 @@ export default class PublicTimeline extends React.PureComponent { dispatch(expandPublicTimeline({ maxId, onlyMedia })); } - shouldUpdateScroll = (prevRouterProps, { location }) => { - return !(location.state && location.state.mastodonModalOpen) - } - render () { const { intl, columnId, hasUnread, multiColumn, onlyMedia } = this.props; const pinned = !!columnId; |