From 348aa3e5e185155068d7a0a3ffcfbd79bddb06c4 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Fri, 17 Jul 2015 21:29:41 +0100 Subject: [PATCH] fix up memberlist a bit more --- src/controllers/organisms/RoomView.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/controllers/organisms/RoomView.js b/src/controllers/organisms/RoomView.js index 32f5288154..4ab239d9e8 100644 --- a/src/controllers/organisms/RoomView.js +++ b/src/controllers/organisms/RoomView.js @@ -252,8 +252,11 @@ module.exports = { if (i > 0 && count < this.state.messageCap - 1) { if (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) + (this.state.room.timeline[i].sender.userId === + this.state.room.timeline[i - 1].sender.userId) && + (this.state.room.timeline[i].getType() == + this.state.room.timeline[i - 1].getType()) + ) { continuation = true; }