mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-11-30 07:53:31 +03:00
Code Issues Projects Releases Packages Wiki Activity

Let the tile contents specify whether it requires a sender profile or not. Fixes #250.

Browse source
This commit is contained in:
David Baker 2015-10-23 09:24:25 +01:00
parent 08270b26ee
commit 7c6fb36520
3 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/skins/vector/views/molecules/EventAsTextTile.js
View file

@ -19,22 +19,22 @@ limitations under the License.
var React = require('react');
var EventAsTextTileController = require('matrix-react-sdk/lib/controllers/molecules/EventAsTextTile')
var sdk = require('matrix-react-sdk')
var TextForEvent = require('matrix-react-sdk/lib/TextForEvent');
module.exports = React.createClass({
displayName: 'EventAsTextTile',
mixins: [EventAsTextTileController],
render: function() {
var MessageTimestamp = sdk.getComponent('atoms.MessageTimestamp');
var MemberAvatar = sdk.getComponent('atoms.MemberAvatar');
statics: {
needsSenderProfile: function() {
return false;
}
},
render: function() {
var text = TextForEvent.textForEvent(this.props.mxEvent);
if (text == null || text.length == 0) return null;
var timestamp = this.props.last ? <MessageTimestamp ts={this.props.mxEvent.getTs()} /> : null;
var avatar = this.props.mxEvent.sender ? <MemberAvatar member={this.props.mxEvent.sender} /> : null;
return (
<div className="mx_EventAsTextTile">
{TextForEvent.textForEvent(this.props.mxEvent)}

4
src/skins/vector/views/molecules/EventTile.js
View file

@ -114,7 +114,9 @@ module.exports = React.createClass({
</div>
);
}
sender = <SenderProfile mxEvent={this.props.mxEvent} aux={aux} />;
if (EventTileType.needsSenderProfile()) {
sender = <SenderProfile mxEvent={this.props.mxEvent} aux={aux} />;
}
}
return (
<div className={classes}>

6
src/skins/vector/views/molecules/MessageTile.js
View file

@ -28,6 +28,12 @@ module.exports = React.createClass({
displayName: 'MessageTile',
mixins: [MessageTileController],
statics: {
needsSenderProfile: function() {
return true;
}
},
render: function() {
var UnknownMessageTile = sdk.getComponent('molecules.UnknownMessageTile');