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

final(?) PR fixes

pull/21833/head
Matthew Hodgson 2016-04-18 14:48:55 +01:00
parent 60f92fd15b
commit a95c45eb96
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -357,9 +357,9 @@ module.exports = React.createClass({
}
},
// returns -1 if a < b.
// 0 if a and b are equivalent
// 1 if a > b.
// returns negative if a comes before b,
// returns 0 if a and b are equivalent in ordering
// returns positive if a comes after b.
memberSort: function(userIdA, userIdB) {
// order by last active, with "active now" first.
// ...and then by power
@ -419,12 +419,12 @@ module.exports = React.createClass({
}
*/
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;
var lastActiveTsA = userA && userA.lastActiveTs ? userA.lastActiveTs : 0;
var lastActiveTsB = userB && userB.lastActiveTs ? userB.lastActiveTs : 0;
// console.log("comparing ts: " + lastActiveTsA + " and " + lastActiveTsB);
return lastActiveTsA - lastActiveTsB;
return lastActiveTsB - lastActiveTsA;
}
},