diff options
author | David Yip <yipdw@member.fsf.org> | 2018-03-27 10:20:52 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-27 10:20:52 -0500 |
commit | 6af17b79c57b95a39fb4ed325aeff3edf02162ea (patch) | |
tree | cea93c6d89d9de7e21b0a005f7aa6ff70ea2ca74 /app/javascript/flavours/glitch/components/attachment_list.js | |
parent | 837b3804bfed9db1cf92923c4f6202aa7117d408 (diff) | |
parent | 88790b91de64ad7848477a9edcbebbbe1adb5d13 (diff) |
Merge pull request #399 from ThibG/glitch-soc/features/attachments-list
Port attachment lists to glitch-soc flavour
Diffstat (limited to 'app/javascript/flavours/glitch/components/attachment_list.js')
-rw-r--r-- | app/javascript/flavours/glitch/components/attachment_list.js | 32 |
1 files changed, 27 insertions, 5 deletions
diff --git a/app/javascript/flavours/glitch/components/attachment_list.js b/app/javascript/flavours/glitch/components/attachment_list.js index 3a28c70f3..b31d40b04 100644 --- a/app/javascript/flavours/glitch/components/attachment_list.js +++ b/app/javascript/flavours/glitch/components/attachment_list.js @@ -1,5 +1,6 @@ import React from 'react'; import ImmutablePropTypes from 'react-immutable-proptypes'; +import PropTypes from 'prop-types'; import ImmutablePureComponent from 'react-immutable-pure-component'; const filename = url => url.split('/').pop().split('#')[0].split('?')[0]; @@ -8,10 +9,29 @@ export default class AttachmentList extends ImmutablePureComponent { static propTypes = { media: ImmutablePropTypes.list.isRequired, + compact: PropTypes.bool, }; render () { - const { media } = this.props; + const { media, compact } = this.props; + + if (compact) { + return ( + <div className='attachment-list compact'> + <ul className='attachment-list__list'> + {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> + ); + } return ( <div className='attachment-list'> @@ -20,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> ); |