PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #1750 from matrix-org/luke/fix-room-list-custom-tag-ordering2

Browse source 
Fix custom tags not being ordered manually
This commit is contained in:
David Baker 2018-02-14 11:40:59 +00:00 committed by GitHub
commit ca763faf96
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/stores/RoomListStore.js
View file

@ -160,32 +160,26 @@ class RoomListStore extends Store {
}); });
const listOrders = { const listOrders = {
"manual": [ "m.favourite": "manual",
"m.favourite", "im.vector.fake.invite": "recent",
], "im.vector.fake.recent": "recent",
"recent": [ "im.vector.fake.direct": "recent",
"im.vector.fake.invite", "m.lowpriority": "recent",
"im.vector.fake.recent", "im.vector.fake.archived": "recent",
"im.vector.fake.direct",
"m.lowpriority",
"im.vector.fake.archived",
],
}; };
Object.keys(listOrders).forEach((order) => { Object.keys(lists).forEach((listKey) => {
listOrders[order].forEach((listKey) => { let comparator;
let comparator; switch (listOrders[listKey]) {
switch (order) { case "recent":
case "recent": comparator = this._recentsComparator;
comparator = this._recentsComparator; break;
break; case "manual":
case "manual": default:
default: comparator = this._getManualComparator(listKey, optimisticRequest);
comparator = this._getManualComparator(listKey, optimisticRequest); break;
break; }
} lists[listKey].sort(comparator);
lists[listKey].sort(comparator);
});
}); });
this._setState({ this._setState({