mirror of
https://github.com/element-hq/element-web.git
synced 2024-12-03 20:36:57 +03:00
Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
c68eb57798
1 changed files with 18 additions and 24 deletions
|
@ -160,22 +160,17 @@ class RoomListStore extends Store {
|
|||
});
|
||||
|
||||
const listOrders = {
|
||||
"manual": [
|
||||
"m.favourite",
|
||||
],
|
||||
"recent": [
|
||||
"im.vector.fake.invite",
|
||||
"im.vector.fake.recent",
|
||||
"im.vector.fake.direct",
|
||||
"m.lowpriority",
|
||||
"im.vector.fake.archived",
|
||||
],
|
||||
"m.favourite": "manual",
|
||||
"im.vector.fake.invite": "recent",
|
||||
"im.vector.fake.recent": "recent",
|
||||
"im.vector.fake.direct": "recent",
|
||||
"m.lowpriority": "recent",
|
||||
"im.vector.fake.archived": "recent",
|
||||
};
|
||||
|
||||
Object.keys(listOrders).forEach((order) => {
|
||||
listOrders[order].forEach((listKey) => {
|
||||
Object.keys(lists).forEach((listKey) => {
|
||||
let comparator;
|
||||
switch (order) {
|
||||
switch (listOrders[listKey]) {
|
||||
case "recent":
|
||||
comparator = this._recentsComparator;
|
||||
break;
|
||||
|
@ -186,7 +181,6 @@ class RoomListStore extends Store {
|
|||
}
|
||||
lists[listKey].sort(comparator);
|
||||
});
|
||||
});
|
||||
|
||||
this._setState({
|
||||
lists,
|
||||
|
|
Loading…
Reference in a new issue