imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'luke/feature-async-pills' of github.com:matrix-org/matrix-react-sdk into luke/feature-async-pills

Browse source
This commit is contained in:
Luke Barnard 2017-07-25 09:37:47 +01:00
commit 11f3a1db72
5 changed files with 113 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/views/elements/Pill.js
View file

@ -173,11 +173,11 @@ const Pill = React.createClass({
if (this.state.pillType) {
return this.props.inMessage ?
<a className={classes} href={this.props.url}>
<a className={classes} href={this.props.url} title={resource}>
{avatar}
{linkText}
</a> :
<span className={classes}>
<span className={classes} title={resource}>
{avatar}
{linkText}
</span>;