diff options
author | Claire <claire.github-309c@sitedethib.com> | 2021-09-08 14:39:14 +0200 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2021-09-08 16:36:30 +0200 |
commit | 6bbcd99f1407bf0a34fb7367d4fae42f058c8ac7 (patch) | |
tree | 04c368363bf3361d2895c8c0de265b9e5996e22c /app/javascript/flavours/glitch/components/status_icons.js | |
parent | e2921375c3dee8b9fec47b0267edcecef380bc42 (diff) |
Fix media attachments not being displayed on polls
Fixes #1595
Diffstat (limited to 'app/javascript/flavours/glitch/components/status_icons.js')
-rw-r--r-- | app/javascript/flavours/glitch/components/status_icons.js | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/app/javascript/flavours/glitch/components/status_icons.js b/app/javascript/flavours/glitch/components/status_icons.js index f4d0a7405..e66947f4a 100644 --- a/app/javascript/flavours/glitch/components/status_icons.js +++ b/app/javascript/flavours/glitch/components/status_icons.js @@ -27,7 +27,7 @@ class StatusIcons extends React.PureComponent { static propTypes = { status: ImmutablePropTypes.map.isRequired, - mediaIcon: PropTypes.string, + mediaIcons: PropTypes.arrayOf(PropTypes.string), collapsible: PropTypes.bool, collapsed: PropTypes.bool, directMessage: PropTypes.bool, @@ -44,8 +44,8 @@ class StatusIcons extends React.PureComponent { } } - mediaIconTitleText () { - const { intl, mediaIcon } = this.props; + mediaIconTitleText (mediaIcon) { + const { intl } = this.props; switch (mediaIcon) { case 'link': @@ -61,11 +61,24 @@ class StatusIcons extends React.PureComponent { } } + renderIcon (mediaIcon) { + return ( + <Icon + fixedWidth + className='status__media-icon' + key={`media-icon--${mediaIcon}`} + id={mediaIcon} + aria-hidden='true' + title={this.mediaIconTitleText(mediaIcon)} + /> + ); + } + // Rendering. render () { const { status, - mediaIcon, + mediaIcons, collapsible, collapsed, directMessage, @@ -90,15 +103,7 @@ class StatusIcons extends React.PureComponent { aria-hidden='true' title={intl.formatMessage(messages.localOnly)} />} - {mediaIcon ? ( - <Icon - fixedWidth - className='status__media-icon' - id={mediaIcon} - aria-hidden='true' - title={this.mediaIconTitleText()} - /> - ) : null} + { !!mediaIcons && mediaIcons.map(icon => this.renderIcon(icon)) } {!directMessage && <VisibilityIcon visibility={status.get('visibility')} />} {collapsible ? ( <IconButton |