mad-star-studio/element-web
2
0
Fork 0
Code Pull requests Activity

fix various edge cases when dragging stuff back to the conversations list

Browse source
This commit is contained in:
Matthew Hodgson 2015-11-06 23:30:57 +01:00
parent 89327bd38f
commit fe442f5c24
4 changed files with 19 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/controllers/organisms/RoomList.js
View file

@ -135,11 +135,16 @@ module.exports = {
getRoomLists: function() {
var s = { lists: {} };
s.lists["m.invite"] = [];
s.lists["m.favourite"] = [];
s.lists["m.recent"] = [];
s.lists["m.lowpriority"] = [];
s.lists["m.archived"] = [];
MatrixClientPeg.get().getRooms().forEach(function(room) {
var me = room.getMember(MatrixClientPeg.get().credentials.userId);
if (me && me.membership == "invite") {
s.lists["m.invite"] = s.lists["m.invite"] || [];
s.lists["m.invite"].push(room);
}
else {
@ -172,7 +177,6 @@ module.exports = {
}
}
else {
s.lists["m.recent"] = s.lists["m.recent"] || [];
s.lists["m.recent"].push(room);
}
}