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

Merge pull request #1234 from matrix-org/luke/feature-mention-pill 

Add mx_UserPill_me class to user pills that match credentials.userId
pull/21833/head
Luke Barnard 2017-07-19 17:56:24 +01:00 committed by GitHub
parent 61d5d078dd 5d1b33d2a8
commit ecaf6e5223
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/components/views/messages/TextualBody.js
View File

@ -32,6 +32,7 @@ import { _t } from '../../../languageHandler';
import UserSettingsStore from "../../../UserSettingsStore"; import UserSettingsStore from "../../../UserSettingsStore";
import MatrixClientPeg from '../../../MatrixClientPeg'; import MatrixClientPeg from '../../../MatrixClientPeg';
import {RoomMember} from 'matrix-js-sdk'; import {RoomMember} from 'matrix-js-sdk';
import classNames from 'classnames';
linkifyMatrix(linkify); linkifyMatrix(linkify);
@ -205,8 +206,15 @@ module.exports = React.createClass({
} }
if (avatar) { if (avatar) {
const avatarContainer = document.createElement('span'); const avatarContainer = document.createElement('span');
node.className = "mx_MTextBody_pill " + node.className = classNames(
(resourceType === "user" ? "mx_UserPill" : "mx_RoomPill"); "mx_MTextBody_pill",
{
"mx_UserPill": match[1] === "user",
"mx_RoomPill": match[1] === "room",
"mx_UserPill_me":
userId === MatrixClientPeg.get().credentials.userId,
},
);
ReactDOM.render(avatar, avatarContainer); ReactDOM.render(avatar, avatarContainer);
node.insertBefore(avatarContainer, node.firstChild); node.insertBefore(avatarContainer, node.firstChild);
} }