diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-02-05 01:19:27 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-02-05 01:19:27 +0100 |
| commit | af007f2def802560f548d85f81f0f4e5039ae737 (patch) | |
| tree | b81d8fe7a63b56088ded740992fd243b251ba781 /app/assets/javascripts/components | |
| parent | d4d3a10c25ea3b74e1c9ff7312715c33718da3b0 (diff) | |
Display mentions prepended to the content warning
Diffstat (limited to 'app/assets/javascripts/components')
| -rw-r--r-- | app/assets/javascripts/components/components/status_content.jsx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/app/assets/javascripts/components/components/status_content.jsx b/app/assets/javascripts/components/components/status_content.jsx index dd11d3a01..1531e071c 100644 --- a/app/assets/javascripts/components/components/status_content.jsx +++ b/app/assets/javascripts/components/components/status_content.jsx @@ -102,8 +102,14 @@ const StatusContent = React.createClass({ const spoilerContent = { __html: emojify(escapeTextContentForBrowser(status.get('spoiler_text', ''))) }; if (status.get('spoiler_text').length > 0) { - const mentionLinks = status.get('mentions').map(item => <Permalink to={`/accounts/${item.get('id')}`} href={item.get('url')} key={item.get('id') className='mention'>@<span>{item.get('username')}</span></Permalink>}</span>) }; + const mentionLinks = status.get('mentions').map(item => ( + <Permalink to={`/accounts/${item.get('id')}`} href={item.get('url')} key={item.get('id')} className='mention'> + @<span>{item.get('username')}</span> + </Permalink> + )).reduce((aggregate, item) => [...aggregate, item, ' '], []) + const toggleText = hidden ? <FormattedMessage id='status.show_more' defaultMessage='Show more' /> : <FormattedMessage id='status.show_less' defaultMessage='Show less' />; + return ( <div className='status__content' style={{ cursor: 'pointer' }} onMouseDown={this.handleMouseDown} onMouseUp={this.handleMouseUp}> <p style={{ marginBottom: hidden ? '0px' : '' }} > |