Merge branch 'develop' into matthew/redesign
This commit is contained in:
commit
ffb9ce89c7
15 changed files with 100 additions and 23 deletions
|
@ -34,6 +34,7 @@ module.exports = {
|
|||
cli.on("Room.timeline", this.onRoomTimeline);
|
||||
cli.on("Room.name", this.onRoomName);
|
||||
cli.on("RoomState.events", this.onRoomStateEvents);
|
||||
cli.on("RoomMember.name", this.onRoomMemberName);
|
||||
|
||||
var s = this.getRoomLists();
|
||||
s.activityMap = {};
|
||||
|
@ -112,6 +113,10 @@ module.exports = {
|
|||
setTimeout(this.refreshRoomList, 0);
|
||||
},
|
||||
|
||||
onRoomMemberName: function(ev, member) {
|
||||
setTimeout(this.refreshRoomList, 0);
|
||||
},
|
||||
|
||||
|
||||
refreshRoomList: function() {
|
||||
this.setState(this.getRoomLists());
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue