From 370310bf82620049ac5620c81163f5407a116aed Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Tue, 15 Sep 2015 15:02:02 +0100
Subject: [PATCH] Use better variable names

---
 src/controllers/organisms/RoomList.js | 6 +++---
 src/controllers/organisms/RoomView.js | 9 ++++-----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/controllers/organisms/RoomList.js b/src/controllers/organisms/RoomList.js
index 6acce59a35..da5715521d 100644
--- a/src/controllers/organisms/RoomList.js
+++ b/src/controllers/organisms/RoomList.js
@@ -99,9 +99,9 @@ module.exports = {
     getRoomList: function() {
         return RoomListSorter.mostRecentActivityFirst(
             MatrixClientPeg.get().getRooms().filter(function(room) {
-                var member = room.getMember(MatrixClientPeg.get().credentials.userId);
+                var me = room.getMember(MatrixClientPeg.get().credentials.userId);
                 var shouldShowRoom =  (
-                    member && (member.membership == "join" || member.membership == "invite")
+                    me && (me.membership == "join" || me.membership == "invite")
                 );
                 // hiding conf rooms only ever toggles shouldShowRoom to false
                 if (shouldShowRoom && HIDE_CONFERENCE_CHANS) {
@@ -109,7 +109,7 @@ module.exports = {
                     var joinedMembers = room.getJoinedMembers();
                     if (joinedMembers.length === 2) {
                         var otherMember = joinedMembers.filter(function(m) {
-                            return m.userId !== member.userId
+                            return m.userId !== me.userId
                         })[0];
                         if (ConferenceHandler.isConferenceUser(otherMember)) {
                             // console.log("Hiding conference 1:1 room %s", room.roomId);
diff --git a/src/controllers/organisms/RoomView.js b/src/controllers/organisms/RoomView.js
index 459a3606e2..1856cac992 100644
--- a/src/controllers/organisms/RoomView.js
+++ b/src/controllers/organisms/RoomView.js
@@ -187,22 +187,21 @@ module.exports = {
     },
 
     _updateConfCallNotification: function() {
-        var member = MatrixClientPeg.get().getRoom(this.props.roomId).getMember(
+        var confMember = MatrixClientPeg.get().getRoom(this.props.roomId).getMember(
             ConferenceHandler.getConferenceUserIdForRoom(this.props.roomId)
         );
 
-        if (!member) {
+        if (!confMember) {
             return;
         }
-        console.log("_updateConfCallNotification");
-        var confCall = CallHandler.getConferenceCall(member.roomId);
+        var confCall = CallHandler.getConferenceCall(confMember.roomId);
 
         // A conf call notification should be displayed if there is an ongoing
         // conf call but this cilent isn't a part of it.
         this.setState({
             displayConfCallNotification: (
                 (!confCall || confCall.call_state === "ended") &&
-                member.membership === "join"
+                confMember.membership === "join"
             )
         });
     },