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

PR feedback

pull/21833/head
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 ConferenceHandler = CallHandler.getConferenceHandler();
all_user_ids.sort(this.memberSort(Date.now()));
all_user_ids.sort(this.memberSort);
var to_display = [];
var count = 0;
@ -357,8 +357,10 @@ module.exports = React.createClass({
}
},
memberSort: function(now) {
return (userIdA, userIdB) => {
// returns -1 if a < b.
// 0 if a and b are equivalent
// 1 if a > b.
memberSort: function(userIdA, userIdB) {
// order by last active, with "active now" first.
// ...and then by power
// ...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 lastActiveTsB = userB && userB.lastActiveAgo ? (now - (userB.lastPresenceTs - userB.lastActiveAgo)) : Number.MAX_SAFE_INTEGER;
var lastActiveTsA = userA && userA.lastActiveAgo ? (userA.lastPresenceTs - userA.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);