Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Put poll options behind content warnings (#10983)

Browse source 
* Put poll options behind CWs in WebUI

* Put polls behind CWs on public pages

* Add poll icon to public pages CWs

* Revert to not showing an icon in the CW button
This commit is contained in:
ThibG 2019-06-08 17:40:59 +02:00 • committed by Eugen Rochko
parent 20dda5cca0
commit e9ddd5a159
6 changed files with 36 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/javascript/mastodon/components/status.js
View file

@ -16,7 +16,6 @@ import { MediaGallery, Video } from '../features/ui/util/async-components';
import { HotKeys } from 'react-hotkeys';
import classNames from 'classnames';
import Icon from 'mastodon/components/icon';
import PollContainer from 'mastodon/containers/poll_container';
import { displayMedia } from '../initial_state';
// We use the component (and not the container) since we do not want
@ -321,9 +320,7 @@ class Status extends ImmutablePureComponent {
status = status.get('reblog');
}
if (status.get('poll')) {
media = <PollContainer pollId={status.get('poll')} />;
} else if (status.get('media_attachments').size > 0) {
if (status.get('media_attachments').size > 0) {
if (this.props.muted) {
media = (
<AttachmentList