djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2024-11-30 20:10:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

Do not scroll timelines when *closing* media modals

Browse Source 
Media modals push an history state so that pressing back on mobile closes them.
We made sure to not scroll when opening them, but not when *closing* them,
which caused some issues in rare cases.
This commit is contained in:
Thibaut Girka 2018-10-06 18:53:49 +02:00 committed by ThibG
parent f990b9c768
commit 7cc7843109
10 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/javascript/flavours/glitch/components/scrollable_list.js
View File

@ -150,6 +150,7 @@ export default class ScrollableList extends PureComponent {
} }
defaultShouldUpdateScroll = (prevRouterProps, { location }) => { defaultShouldUpdateScroll = (prevRouterProps, { location }) => {
if ((((prevRouterProps || {}).location || {}).state || {}).mastodonModalOpen) return false;
return !(location.state && location.state.mastodonModalOpen); return !(location.state && location.state.mastodonModalOpen);
} }

3
app/javascript/flavours/glitch/features/account_gallery/index.js
View File

@ -90,7 +90,8 @@ export default class AccountGallery extends ImmutablePureComponent {
} }
shouldUpdateScroll = (prevRouterProps, { location }) => { shouldUpdateScroll = (prevRouterProps, { location }) => {
return !(location.state && location.state.mastodonModalOpen) if ((((prevRouterProps || {}).location || {}).state || {}).mastodonModalOpen) return false;
return !(location.state && location.state.mastodonModalOpen);
} }
render () { render () {

3
app/javascript/flavours/glitch/features/blocks/index.js
View File

@ -43,7 +43,8 @@ export default class Blocks extends ImmutablePureComponent {
} }
shouldUpdateScroll = (prevRouterProps, { location }) => { shouldUpdateScroll = (prevRouterProps, { location }) => {
return !(location.state && location.state.mastodonModalOpen) if ((((prevRouterProps || {}).location || {}).state || {}).mastodonModalOpen) return false;
return !(location.state && location.state.mastodonModalOpen);
} }
render () { render () {

1
app/javascript/flavours/glitch/features/favourites/index.js
View File

@ -34,6 +34,7 @@ export default class Favourites extends ImmutablePureComponent {
} }
shouldUpdateScroll = (prevRouterProps, { location }) => { shouldUpdateScroll = (prevRouterProps, { location }) => {
if ((((prevRouterProps || {}).location || {}).state || {}).mastodonModalOpen) return false;
return !(location.state && location.state.mastodonModalOpen); return !(location.state && location.state.mastodonModalOpen);
} }

1
app/javascript/flavours/glitch/features/follow_requests/index.js
View File

@ -43,6 +43,7 @@ export default class FollowRequests extends ImmutablePureComponent {
} }
shouldUpdateScroll = (prevRouterProps, { location }) => { shouldUpdateScroll = (prevRouterProps, { location }) => {
if ((((prevRouterProps || {}).location || {}).state || {}).mastodonModalOpen) return false;
return !(location.state && location.state.mastodonModalOpen); return !(location.state && location.state.mastodonModalOpen);
} }

1
app/javascript/flavours/glitch/features/followers/index.js
View File

@ -57,6 +57,7 @@ export default class Followers extends ImmutablePureComponent {
} }
shouldUpdateScroll = (prevRouterProps, { location }) => { shouldUpdateScroll = (prevRouterProps, { location }) => {
if ((((prevRouterProps || {}).location || {}).state || {}).mastodonModalOpen) return false;
return !(location.state && location.state.mastodonModalOpen); return !(location.state && location.state.mastodonModalOpen);
} }

3
app/javascript/flavours/glitch/features/following/index.js
View File

@ -57,7 +57,8 @@ export default class Following extends ImmutablePureComponent {
} }
shouldUpdateScroll = (prevRouterProps, { location }) => { shouldUpdateScroll = (prevRouterProps, { location }) => {
return !(location.state && location.state.mastodonModalOpen) if ((((prevRouterProps || {}).location || {}).state || {}).mastodonModalOpen) return false;
return !(location.state && location.state.mastodonModalOpen);
} }
render () { render () {

1
app/javascript/flavours/glitch/features/mutes/index.js
View File

@ -43,6 +43,7 @@ export default class Mutes extends ImmutablePureComponent {
} }
shouldUpdateScroll = (prevRouterProps, { location }) => { shouldUpdateScroll = (prevRouterProps, { location }) => {
if ((((prevRouterProps || {}).location || {}).state || {}).mastodonModalOpen) return false;
return !(location.state && location.state.mastodonModalOpen); return !(location.state && location.state.mastodonModalOpen);
} }

1
app/javascript/flavours/glitch/features/reblogs/index.js
View File

@ -34,6 +34,7 @@ export default class Reblogs extends ImmutablePureComponent {
} }
shouldUpdateScroll = (prevRouterProps, { location }) => { shouldUpdateScroll = (prevRouterProps, { location }) => {
if ((((prevRouterProps || {}).location || {}).state || {}).mastodonModalOpen) return false;
return !(location.state && location.state.mastodonModalOpen); return !(location.state && location.state.mastodonModalOpen);
} }

3
app/javascript/flavours/glitch/features/status/index.js
View File

@ -364,7 +364,8 @@ export default class Status extends ImmutablePureComponent {
} }
shouldUpdateScroll = (prevRouterProps, { location }) => { shouldUpdateScroll = (prevRouterProps, { location }) => {
return !(location.state && location.state.mastodonModalOpen) if ((((prevRouterProps || {}).location || {}).state || {}).mastodonModalOpen) return false;
return !(location.state && location.state.mastodonModalOpen);
} }
render () { render () {