mirror of
https://github.com/element-hq/element-web
synced 2024-11-27 19:56:47 +03:00
Initial pass at the /me and action messages, without name highlighting, and missing avatar for continuation messages after a /me or action message
This commit is contained in:
parent
52f5061cc5
commit
a55c4a2a52
1 changed files with 11 additions and 3 deletions
|
@ -362,6 +362,8 @@ module.exports = React.createClass({
|
||||||
|
|
||||||
var content = this.props.mxEvent.getContent();
|
var content = this.props.mxEvent.getContent();
|
||||||
var msgtype = content.msgtype;
|
var msgtype = content.msgtype;
|
||||||
|
var eventType = this.props.mxEvent.getType();
|
||||||
|
var isInfoMessage = (msgtype === 'm.emote' || eventType !== 'm.room.message');
|
||||||
|
|
||||||
var EventTileType = sdk.getComponent(eventTileTypes[this.props.mxEvent.getType()]);
|
var EventTileType = sdk.getComponent(eventTileTypes[this.props.mxEvent.getType()]);
|
||||||
// This shouldn't happen: the caller should check we support this type
|
// This shouldn't happen: the caller should check we support this type
|
||||||
|
@ -372,6 +374,7 @@ module.exports = React.createClass({
|
||||||
|
|
||||||
var classes = classNames({
|
var classes = classNames({
|
||||||
mx_EventTile: true,
|
mx_EventTile: true,
|
||||||
|
mx_EventTile_info: isInfoMessage,
|
||||||
mx_EventTile_sending: ['sending', 'queued'].indexOf(
|
mx_EventTile_sending: ['sending', 'queued'].indexOf(
|
||||||
this.props.eventSendStatus
|
this.props.eventSendStatus
|
||||||
) !== -1,
|
) !== -1,
|
||||||
|
@ -397,12 +400,17 @@ module.exports = React.createClass({
|
||||||
var readAvatars = this.getReadAvatars();
|
var readAvatars = this.getReadAvatars();
|
||||||
|
|
||||||
var avatar, sender;
|
var avatar, sender;
|
||||||
if (!this.props.continuation) {
|
if (isInfoMessage) {
|
||||||
|
avatar = (
|
||||||
|
<div className="mx_EventTile_avatar">
|
||||||
|
<MemberAvatar member={this.props.mxEvent.sender} width={14} height={14} onClick={ this.onMemberAvatarClick } />
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
} else if (!this.props.continuation) {
|
||||||
if (this.props.mxEvent.sender) {
|
if (this.props.mxEvent.sender) {
|
||||||
avatar = (
|
avatar = (
|
||||||
<div className="mx_EventTile_avatar">
|
<div className="mx_EventTile_avatar">
|
||||||
<MemberAvatar member={this.props.mxEvent.sender} width={30} height={30}
|
<MemberAvatar member={this.props.mxEvent.sender} width={30} height={30} onClick={ this.onMemberAvatarClick } />
|
||||||
onClick={ this.onMemberAvatarClick } />
|
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue