diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-03-27 15:50:05 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-03-27 16:09:33 +0200 |
commit | 88790b91de64ad7848477a9edcbebbbe1adb5d13 (patch) | |
tree | cea93c6d89d9de7e21b0a005f7aa6ff70ea2ca74 /app/javascript/flavours/glitch/components/attachment_list.js | |
parent | 3bc5452449d492fd7fc9bba28a24acb877fc8dad (diff) |
[Glitch] Display AttachmentList in notifications
Port 77406d3a092db48250a85984dde2f2cc81386146 to glitch-soc
Diffstat (limited to 'app/javascript/flavours/glitch/components/attachment_list.js')
-rw-r--r-- | app/javascript/flavours/glitch/components/attachment_list.js | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/app/javascript/flavours/glitch/components/attachment_list.js b/app/javascript/flavours/glitch/components/attachment_list.js index ef937fb4c..b31d40b04 100644 --- a/app/javascript/flavours/glitch/components/attachment_list.js +++ b/app/javascript/flavours/glitch/components/attachment_list.js @@ -19,11 +19,15 @@ export default class AttachmentList extends ImmutablePureComponent { return ( <div className='attachment-list compact'> <ul className='attachment-list__list'> - {media.map(attachment => ( - <li key={attachment.get('id')}> - <a href={attachment.get('remote_url')} target='_blank' rel='noopener'><i className='fa fa-link' /> {filename(attachment.get('remote_url'))}</a> - </li> - ))} + {media.map(attachment => { + const displayUrl = attachment.get('remote_url') || attachment.get('url'); + + return ( + <li key={attachment.get('id')}> + <a href={displayUrl} target='_blank' rel='noopener'><i className='fa fa-link' /> {filename(displayUrl)}</a> + </li> + ); + })} </ul> </div> ); @@ -36,11 +40,13 @@ export default class AttachmentList extends ImmutablePureComponent { </div> <ul className='attachment-list__list'> - {media.map(attachment => - (<li key={attachment.get('id')}> - <a href={attachment.get('remote_url')} target='_blank' rel='noopener'>{filename(attachment.get('remote_url'))}</a> + const displayUrl = attachment.get('remote_url') || attachment.get('url'); + + {media.map(attachment => { + return (<li key={attachment.get('id')}> + <a href={displayUrl} target='_blank' rel='noopener'>{filename(displayUrl)}</a> </li>) - )} + })} </ul> </div> ); |