PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #1245 from matrix-org/luke/feature-mentions-ambiguate

Browse source 
Remove disambiguation from user mentions, add tooltip for mxid
This commit is contained in:
Luke Barnard 2017-07-24 17:36:42 +01:00 committed by GitHub
commit bcd1ab5cd4
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -78,7 +78,7 @@ export default React.createClass({
new RoomMember(null, resource); new RoomMember(null, resource);
if (member) { if (member) {
userId = member.userId; userId = member.userId;
linkText = member.name; linkText = member.rawDisplayName;
avatar = <MemberAvatar member={member} width={16} height={16}/>; avatar = <MemberAvatar member={member} width={16} height={16}/>;
} }
} else if (isRoomPill) { } else if (isRoomPill) {
@ -101,11 +101,11 @@ export default React.createClass({
if ((isUserPill || isRoomPill) && avatar) { if ((isUserPill || isRoomPill) && avatar) {
return this.props.inMessage ? return this.props.inMessage ?
<a className={classes} href={this.props.url}> <a className={classes} href={this.props.url} title={resource}>
{avatar} {avatar}
{linkText} {linkText}
</a> : </a> :
<span className={classes}> <span className={classes} title={resource}>
{avatar} {avatar}
{linkText} {linkText}
</span>; </span>;