imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

support bubble tile style for verification tiles

Browse source
This commit is contained in:
Bruno Windels 2019-11-07 17:44:53 +01:00
parent d7f5252f9a
commit 805c83779a
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/components/views/rooms/EventTile.js
View file

@ -555,8 +555,10 @@ module.exports = createReactClass({
const eventType = this.props.mxEvent.getType(); const eventType = this.props.mxEvent.getType();
// Info messages are basically information about commands processed on a room // Info messages are basically information about commands processed on a room
const isBubbleMessage = eventType.startsWith("m.key.verification") ||
(eventType === "m.room.message" && msgtype.startsWith("m.key.verification"));
let isInfoMessage = ( let isInfoMessage = (
eventType !== 'm.room.message' && eventType !== 'm.sticker' && eventType != 'm.room.create' !isBubbleMessage && eventType !== 'm.room.message' && eventType !== 'm.sticker' && eventType != 'm.room.create'
); );
let tileHandler = getHandlerTile(this.props.mxEvent); let tileHandler = getHandlerTile(this.props.mxEvent);
@ -589,6 +591,7 @@ module.exports = createReactClass({
const isEditing = !!this.props.editState; const isEditing = !!this.props.editState;
const classes = classNames({ const classes = classNames({
mx_EventTile_bubbleContainer: isBubbleMessage,
mx_EventTile: true, mx_EventTile: true,
mx_EventTile_isEditing: isEditing, mx_EventTile_isEditing: isEditing,
mx_EventTile_info: isInfoMessage, mx_EventTile_info: isInfoMessage,
@ -624,7 +627,7 @@ module.exports = createReactClass({
if (this.props.tileShape === "notif") { if (this.props.tileShape === "notif") {
avatarSize = 24; avatarSize = 24;
needsSenderProfile = true; needsSenderProfile = true;
} else if (tileHandler === 'messages.RoomCreate') { } else if (tileHandler === 'messages.RoomCreate' || isBubbleMessage) {
avatarSize = 0; avatarSize = 0;
needsSenderProfile = false; needsSenderProfile = false;
} else if (isInfoMessage) { } else if (isInfoMessage) {
@ -822,7 +825,7 @@ module.exports = createReactClass({
{ readAvatars } { readAvatars }
</div> </div>
{ sender } { sender }
<div className="mx_EventTile_line"> <div className={classNames("mx_EventTile_line", {mx_EventTile_bubbleLine: isBubbleMessage})}>
<a <a
href={permalink} href={permalink}
onClick={this.onPermalinkClicked} onClick={this.onPermalinkClicked}