mirror of
https://github.com/element-hq/element-web.git
synced 2024-12-11 10:18:28 +03:00
Merge pull request #1234 from matrix-org/luke/feature-mention-pill
Add mx_UserPill_me class to user pills that match credentials.userId
This commit is contained in:
commit
ecaf6e5223
1 changed files with 10 additions and 2 deletions
|
@ -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);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue