Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Use upstream's settings for CW auto-expand and column swiping (#1770)

Browse source 
* Use Mastodon server-side settings for automatically expanding toots with CWs

* Add modal warning about settings changes

* Use Mastodon server-side settings for disabling swiping
This commit is contained in:
Claire 2022-05-15 17:30:40 +02:00 • committed by GitHub
parent aa08399e6f
commit dc350be6f5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 396 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/javascript/flavours/glitch/features/ui/components/media_modal.js
View file

@ -12,6 +12,7 @@ import Icon from 'flavours/glitch/components/icon';
import GIFV from 'flavours/glitch/components/gifv';
import Footer from 'flavours/glitch/features/picture_in_picture/components/footer';
import { getAverageFromBlurhash } from 'flavours/glitch/blurhash';
import { disableSwiping } from 'flavours/glitch/util/initial_state';
const messages = defineMessages({
close: { id: 'lightbox.close', defaultMessage: 'Close' },
@ -227,6 +228,7 @@ class MediaModal extends ImmutablePureComponent {
onChangeIndex={this.handleSwipe}
onTransitionEnd={this.handleTransitionEnd}
index={index}
disabled={disableSwiping}
>
{content}
</ReactSwipeableViews>