matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-28 15:22:05 +03:00
Code Activity

back out small avatars for emotes for now as they conflict with the E2E artwork.

Browse Source 
they will be reintroduced once we have lozenges
This commit is contained in:
Matthew Hodgson
2016-09-11 22:49:05 +01:00
parent 83209197f4
commit 46205ad83c
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/structures/MessagePanel.js
View File

@ -346,6 +346,7 @@ module.exports = React.createClass({
continuation = true; continuation = true;
} }
/*
// Work out if this is still a continuation, as we are now showing commands // Work out if this is still a continuation, as we are now showing commands
// and /me messages with their own little avatar. The case of a change of // and /me messages with their own little avatar. The case of a change of
// event type (commands) is handled above, but we need to handle the /me // event type (commands) is handled above, but we need to handle the /me
@ -357,6 +358,7 @@ module.exports = React.createClass({
&& prevEvent.getContent().msgtype === 'm.emote') { && prevEvent.getContent().msgtype === 'm.emote') {
continuation = false; continuation = false;
} }
*/
// local echoes have a fake date, which could even be yesterday. Treat them // local echoes have a fake date, which could even be yesterday. Treat them
// as 'today' for the date separators. // as 'today' for the date separators.

4
src/components/views/rooms/EventTile.js
View File

@ -375,7 +375,7 @@ module.exports = React.createClass({
// Info messages are basically information about commands processed on a // Info messages are basically information about commands processed on a
// room, or emote messages // room, or emote messages
var isInfoMessage = (msgtype === 'm.emote' || eventType !== 'm.room.message'); var isInfoMessage = false; // (msgtype === 'm.emote' || eventType !== 'm.room.message');
var EventTileType = sdk.getComponent(eventTileTypes[eventType]); var EventTileType = sdk.getComponent(eventTileTypes[eventType]);
// This shouldn't happen: the caller should check we support this type // This shouldn't happen: the caller should check we support this type
@ -422,7 +422,7 @@ module.exports = React.createClass({
needsSenderProfile = false; needsSenderProfile = false;
} else { } else {
avatarSize = 30; avatarSize = 30;
needsSenderProfile = true; needsSenderProfile = (eventType === 'm.room.message');
} }
if (this.props.mxEvent.sender && avatarSize) { if (this.props.mxEvent.sender && avatarSize) {