hamptonmoore
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix media icons not being added in CWs

signup-info-prompt
Claire 2021-09-09 16:51:14 +02:00
parent 4a94f4127b
commit 7aa4d481db
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/javascript/flavours/glitch/components/status_content.js
View File

@ -70,7 +70,7 @@ export default class StatusContent extends React.PureComponent {
collapsed: PropTypes.bool,
onExpandedToggle: PropTypes.func,
media: PropTypes.node,
mediaIcon: PropTypes.string,
mediaIcons: PropTypes.arrayOf(PropTypes.string),
parseClick: PropTypes.func,
disabled: PropTypes.bool,
onUpdate: PropTypes.func,
@ -256,7 +256,7 @@ export default class StatusContent extends React.PureComponent {
const {
status,
media,
mediaIcon,
mediaIcons,
parseClick,
disabled,
tagLinks,
@ -295,16 +295,18 @@ export default class StatusContent extends React.PureComponent {
key='0'
/>,
];
if (mediaIcon) {
toggleText.push(
<Icon
fixedWidth
className='status__content__spoiler-icon'
id={mediaIcon}
aria-hidden='true'
key='1'
/>,
);
if (mediaIcons) {
mediaIcons.forEach((mediaIcon, idx) => {
toggleText.push(
<Icon
fixedWidth
className='status__content__spoiler-icon'
id={mediaIcon}
aria-hidden='true'
key={`icon-${idx}`}
/>,
);
});
}
} else {
toggleText = (