tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes columns scrolling to top when opening media modal

Browse Source 
Fixes #700
This commit is contained in:
Thibaut Girka
2018-09-03 13:32:35 +02:00
committed by ThibG
parent 2b82829a53
commit e915bc3e9e
17 changed files with 31 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/javascript/flavours/glitch/features/favourited_statuses/index.js
View File

@ -66,10 +66,6 @@ export default class Favourites extends ImmutablePureComponent {
this.props.dispatch(expandFavouritedStatuses());
}, 300, { leading: true })
shouldUpdateScroll = (prevRouterProps, { location }) => {
return !(location.state && location.state.mastodonModalOpen)
}
render () {
const { intl, statusIds, columnId, multiColumn, hasMore, isLoading } = this.props;
const pinned = !!columnId;
@ -91,7 +87,6 @@ export default class Favourites extends ImmutablePureComponent {
trackScroll={!pinned}
statusIds={statusIds}
scrollKey={`favourited_statuses-${columnId}`}
shouldUpdateScroll={this.shouldUpdateScroll}
hasMore={hasMore}
isLoading={isLoading}
onLoadMore={this.handleLoadMore}