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

Merge remote-tracking branch 'origin/develop' into develop

Browse source
This commit is contained in:
Richard van der Hoff 2016-02-25 18:38:14 +00:00
commit 2bd6529ca0
6 changed files with 43 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/views/rooms/RoomList.js
View file

@ -127,7 +127,7 @@ module.exports = React.createClass({
onRoomTimeline: function(ev, room, toStartOfTimeline) {
if (toStartOfTimeline) return;
this.refreshRoomList();
this._delayedRefreshRoomList();
},
onRoomReceipt: function(receiptEvent, room) {
@ -137,7 +137,7 @@ module.exports = React.createClass({
for (var i = 0; i < receiptKeys.length; ++i) {
var rcpt = receiptEvent.getContent()[receiptKeys[i]];
if (rcpt['m.read'] && rcpt['m.read'][MatrixClientPeg.get().credentials.userId]) {
this.refreshRoomList();
this._delayedRefreshRoomList();
break;
}
}