From 60f92fd15bf0d91d9797f7bb6eda0e7e1778f252 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 18 Apr 2016 14:07:20 +0100
Subject: [PATCH] PR feedback

---
 src/components/views/rooms/MemberList.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/components/views/rooms/MemberList.js b/src/components/views/rooms/MemberList.js
index d3f9d887af..c490a72e46 100644
--- a/src/components/views/rooms/MemberList.js
+++ b/src/components/views/rooms/MemberList.js
@@ -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);