treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Fix polls icon not showing in CW button in detailed statuses

lolsob-rspec
Thibaut Girka 2019-05-03 20:25:57 +02:00 committed by ThibG
parent c15b1aa00c
commit d20647fd94
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/javascript/flavours/glitch/features/status/components/detailed_status.js
View File

@ -125,6 +125,7 @@ export default class DetailedStatus extends ImmutablePureComponent {
if (status.get('poll')) { if (status.get('poll')) {
media = <PollContainer pollId={status.get('poll')} />; media = <PollContainer pollId={status.get('poll')} />;
mediaIcon = 'tasks';
} else if (status.get('media_attachments').size > 0) { } else if (status.get('media_attachments').size > 0) {
if (status.get('media_attachments').some(item => item.get('type') === 'unknown')) { if (status.get('media_attachments').some(item => item.get('type') === 'unknown')) {
media = <AttachmentList media={status.get('media_attachments')} />; media = <AttachmentList media={status.get('media_attachments')} />;
@ -161,7 +162,10 @@ export default class DetailedStatus extends ImmutablePureComponent {
); );
mediaIcon = 'picture-o'; mediaIcon = 'picture-o';
} }
} else media = <Card onOpenMedia={this.props.onOpenMedia} card={status.get('card', null)} />; } else {
media = <Card onOpenMedia={this.props.onOpenMedia} card={status.get('card', null)} />;
mediaIcon = 'link';
}
if (status.get('application')) { if (status.get('application')) {
applicationLink = <span> · <a className='detailed-status__application' href={status.getIn(['application', 'website'])} target='_blank' rel='noopener'>{status.getIn(['application', 'name'])}</a></span>; applicationLink = <span> · <a className='detailed-status__application' href={status.getIn(['application', 'website'])} target='_blank' rel='noopener'>{status.getIn(['application', 'name'])}</a></span>;