forked from treehouse/mastodon
add local setting to auto reveal media behind cw
parent
1bf035fb67
commit
f534f4869e
|
@ -238,7 +238,8 @@ export default class MediaGallery extends React.PureComponent {
|
|||
};
|
||||
|
||||
componentWillReceiveProps (nextProps) {
|
||||
if (!is(nextProps.media, this.props.media)) {
|
||||
console.log(nextProps.revealed);
|
||||
if (!is(nextProps.media, this.props.media) || nextProps.revealed === true) {
|
||||
this.setState({ visible: nextProps.revealed === undefined ? (displayMedia !== 'hide_all' && !nextProps.sensitive || displayMedia === 'show_all') : nextProps.revealed });
|
||||
}
|
||||
}
|
||||
|
|
|
@ -466,6 +466,7 @@ export default class Status extends ImmutablePureComponent {
|
|||
onOpenVideo={this.handleOpenVideo}
|
||||
width={this.props.cachedMediaWidth}
|
||||
cacheWidth={this.props.cacheMediaWidth}
|
||||
revealed={settings.getIn(['media', 'reveal_behind_cw']) && !!status.get('spoiler_text') ? true : undefined}
|
||||
/>)}
|
||||
</Bundle>
|
||||
);
|
||||
|
@ -483,6 +484,7 @@ export default class Status extends ImmutablePureComponent {
|
|||
onOpenMedia={this.props.onOpenMedia}
|
||||
cacheWidth={this.props.cacheMediaWidth}
|
||||
defaultWidth={this.props.cachedMediaWidth}
|
||||
revealed={settings.getIn(['media', 'reveal_behind_cw']) && !!status.get('spoiler_text') ? true : undefined}
|
||||
/>
|
||||
)}
|
||||
</Bundle>
|
||||
|
|
|
@ -328,6 +328,14 @@ export default class LocalSettingsPage extends React.PureComponent {
|
|||
>
|
||||
<FormattedMessage id='settings.inline_preview_cards' defaultMessage='Inline preview cards for external links' />
|
||||
</LocalSettingsPageItem>
|
||||
<LocalSettingsPageItem
|
||||
settings={settings}
|
||||
item={['media', 'reveal_behind_cw']}
|
||||
id='mastodon-settings--reveal-behind-cw'
|
||||
onChange={onChange}
|
||||
>
|
||||
<FormattedMessage id='settings.media_reveal_behind_cw' defaultMessage='Reveal sensitive media behind a CW by default' />
|
||||
</LocalSettingsPageItem>
|
||||
</div>
|
||||
),
|
||||
];
|
||||
|
|
|
@ -138,6 +138,7 @@ export default class DetailedStatus extends ImmutablePureComponent {
|
|||
preventPlayback={!expanded}
|
||||
onOpenVideo={this.handleOpenVideo}
|
||||
autoplay
|
||||
revealed={settings.getIn(['media', 'reveal_behind_cw']) && !!status.get('spoiler_text') ? true : undefined}
|
||||
/>
|
||||
);
|
||||
mediaIcon = 'video-camera';
|
||||
|
@ -151,6 +152,7 @@ export default class DetailedStatus extends ImmutablePureComponent {
|
|||
fullwidth={settings.getIn(['media', 'fullwidth'])}
|
||||
hidden={!expanded}
|
||||
onOpenMedia={this.props.onOpenMedia}
|
||||
revealed={settings.getIn(['media', 'reveal_behind_cw']) && !!status.get('spoiler_text') ? true : undefined}
|
||||
/>
|
||||
);
|
||||
mediaIcon = 'picture-o';
|
||||
|
|
|
@ -119,6 +119,12 @@ export default class Video extends React.PureComponent {
|
|||
revealed: this.props.revealed === undefined ? (displayMedia !== 'hide_all' && !this.props.sensitive || displayMedia === 'show_all') : this.props.revealed,
|
||||
};
|
||||
|
||||
componentWillReceiveProps (nextProps) {
|
||||
if (nextProps.revealed === true) {
|
||||
this.setState({ revealed: true });
|
||||
}
|
||||
}
|
||||
|
||||
// hard coded in components.scss
|
||||
// any way to get ::before values programatically?
|
||||
volWidth = 50;
|
||||
|
|
|
@ -41,6 +41,7 @@ const initialState = ImmutableMap({
|
|||
media : ImmutableMap({
|
||||
letterbox : true,
|
||||
fullwidth : true,
|
||||
reveal_behind_cw : false,
|
||||
}),
|
||||
notifications : ImmutableMap({
|
||||
favicon_badge : false,
|
||||
|
|
Loading…
Reference in New Issue