OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix custom tags not being ordered manually 

Actually fixes vector-im/riot-web#6135 unlike #1748, which
incorrectly assumed that custom tags would be included in
listOrders.

This fix makes sure that the `default` case in the `switch`
is actually used.
pull/21833/head
Luke Barnard 2018-02-14 11:23:29 +00:00
parent 7cc82a682c
commit 3020c8cd94
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({