OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove disambiguation from user mentions, add tooltip for mxid 

Also add a tooltip for room pills = room alias/ID

Requires: https://github.com/matrix-org/matrix-js-sdk/pull/513
pull/21833/head
Luke Barnard 2017-07-24 15:07:33 +01:00
parent eb0575d9c1
commit 727b1ca545
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>;