luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-15 18:06:04 +00:00
Code Issues Projects Releases Wiki Activity

Add setting to disable the pop-in player

Browse source
This commit is contained in:
Thibaut Girka 2020-10-26 20:11:35 +01:00
parent 5ee2b860f9
commit ea5298ab9b
3 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/javascript/flavours/glitch/containers/status_container.js
View file

@ -248,7 +248,11 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
},
deployPictureInPicture (status, type, mediaProps) {
dispatch(deployPictureInPicture(status.get('id'), status.getIn(['account', 'id']), type, mediaProps));
dispatch((_, getState) => {
if (getState().getIn(['local_settings', 'media', 'pop_in_player'])) {
dispatch(deployPictureInPicture(status.get('id'), status.getIn(['account', 'id']), type, mediaProps));
}
});
},
});

8
app/javascript/flavours/glitch/features/local_settings/page/index.js
View file

@ -420,6 +420,14 @@ class LocalSettingsPage extends React.PureComponent {
>
<FormattedMessage id='settings.media_reveal_behind_cw' defaultMessage='Reveal sensitive media behind a CW by default' />
</LocalSettingsPageItem>
<LocalSettingsPageItem
settings={settings}
item={['media', 'pop_in_player']}
id='mastodon-settings--pop-in-player'
onChange={onChange}
>
<FormattedMessage id='settings.pop_in_player' defaultMessage='Enable pop-in player' />
</LocalSettingsPageItem>
</div>
),
];

1
app/javascript/flavours/glitch/reducers/local_settings.js
View file

@ -49,6 +49,7 @@ const initialState = ImmutableMap({
letterbox : true,
fullwidth : true,
reveal_behind_cw : false,
pop_in_player : true,
}),
notifications : ImmutableMap({
favicon_badge : false,