mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-10-26 12:45:53 +03:00
Code Issues Projects Releases Packages Wiki Activity

PR feedback

Browse source
This commit is contained in:
Matthew Hodgson 2016-04-18 14:07:20 +01:00
parent b2d0950a46
commit 60f92fd15b
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/components/views/rooms/MemberList.js
View file

@ -311,7 +311,7 @@ module.exports = React.createClass({
var all_user_ids = Object.keys(all_members); var all_user_ids = Object.keys(all_members);
var ConferenceHandler = CallHandler.getConferenceHandler(); var ConferenceHandler = CallHandler.getConferenceHandler();
all_user_ids.sort(this.memberSort(Date.now())); all_user_ids.sort(this.memberSort);
var to_display = []; var to_display = [];
var count = 0; var count = 0;
@ -357,8 +357,10 @@ module.exports = React.createClass({
} }
}, },
memberSort: function(now) { // returns -1 if a < b.
return (userIdA, userIdB) => { // 0 if a and b are equivalent
// 1 if a > b.
memberSort: function(userIdA, userIdB) {
// order by last active, with "active now" first. // order by last active, with "active now" first.
// ...and then by power // ...and then by power
// ...and then alphabetically. // ...and then alphabetically.
@ -417,8 +419,8 @@ module.exports = React.createClass({
} }
*/ */
var lastActiveTsA = userA && userA.lastActiveAgo ? (now - (userA.lastPresenceTs - userA.lastActiveAgo)) : Number.MAX_SAFE_INTEGER; var lastActiveTsA = userA && userA.lastActiveAgo ? (userA.lastPresenceTs - userA.lastActiveAgo) : Number.MAX_SAFE_INTEGER;
var lastActiveTsB = userB && userB.lastActiveAgo ? (now - (userB.lastPresenceTs - userB.lastActiveAgo)) : Number.MAX_SAFE_INTEGER; var lastActiveTsB = userB && userB.lastActiveAgo ? (userB.lastPresenceTs - userB.lastActiveAgo) : Number.MAX_SAFE_INTEGER;
// console.log("comparing ts: " + lastActiveTsA + " and " + lastActiveTsB); // console.log("comparing ts: " + lastActiveTsA + " and " + lastActiveTsB);