Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-15 20:54:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

group messages together from the same user

Browse Source
This commit is contained in:
Matthew Hodgson 2015-07-14 00:25:51 +01:00
parent a5d24329c2
commit 341fe868e4
3 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
skins/base/css/molecules/MessageTile.css
View File

@ -29,6 +29,16 @@ limitations under the License.
float: left;
}
.mx_MessageTile_continuation {
margin-top: 8px ! important;
}
.mx_MessageTile_continuation .mx_MessageTile_avatar,
.mx_MessageTile_continuation .mx_SenderProfile
{
display: none ! important;
}
.mx_MessageTile .mx_SenderProfile {
color: #acacac;
font-size: 13px;
@ -43,6 +53,8 @@ limitations under the License.
}
.mx_MessageTile_content {
padding-right: 100px;
display: block;
}
.mx_MessageTile_sending {

3
skins/base/views/molecules/MessageTile.js
View File

@ -52,7 +52,8 @@ module.exports = React.createClass({
mx_MessageTile: true,
mx_MessageTile_sending: this.props.mxEvent.status == 'sending',
mx_MessageTile_notSent: this.props.mxEvent.status == 'not_sent',
mx_MessageTile_highlight: this.shouldHighlight()
mx_MessageTile_highlight: this.shouldHighlight(),
mx_MessageTile_continuation: this.props.continuation,
});
return (
<div className={classes}>

13
src/controllers/organisms/RoomView.js
View File

@ -226,9 +226,20 @@ module.exports = {
for (var i = this.state.room.timeline.length-1; i >= 0 && count < this.state.messageCap; --i) {
var mxEv = this.state.room.timeline[i];
var TileType = tileTypes[mxEv.getType()];
var continuation = false;
if (i > 0 &&
count < this.state.messageCap - 1 &&
this.state.room.timeline[i].sender &&
this.state.room.timeline[i - 1].sender &&
this.state.room.timeline[i].sender.userId ===
this.state.room.timeline[i - 1].sender.userId)
{
console.log("i=" + i + ", continuation=true");
continuation = true;
}
if (!TileType) continue;
ret.unshift(
<TileType key={mxEv.getId()} mxEvent={mxEv} />
<TileType key={mxEv.getId()} mxEvent={mxEv} continuation={continuation}/>
);
++count;
}