tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Normalized data in Redux, fix for asset URLs when rendered outside request

Browse Source
This commit is contained in:
Eugen Rochko
2016-09-04 14:04:26 +02:00
parent 7939a216ff
commit 1022d682dc
9 changed files with 71 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/javascripts/components/components/display_name.jsx
View File

@@ -7,9 +7,15 @@ const DisplayName = React.createClass({
},
render () {
let displayName = this.props.account.get('display_name');
if (displayName.length === 0) {
displayName = this.props.account.get('username');
}
return (
<span style={{ display: 'block', maxWidth: '100%', overflow: 'hidden', whiteSpace: 'nowrap', textOverflow: 'ellipsis' }}>
<strong style={{ fontWeight: 'bold' }}>{this.props.account.get('display_name')}</strong> <span style={{ fontSize: '14px' }}>@{this.props.account.get('acct')}</span>
<strong style={{ fontWeight: 'bold' }}>{displayName}</strong> <span style={{ fontSize: '14px' }}>@{this.props.account.get('acct')}</span>
</span>
);
}