From 93d81d27ba408dec8bb0a992be1df6db91e41d46 Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 20 Oct 2015 12:32:40 +0100 Subject: [PATCH 01/12] fix memberDict reference --- src/skins/vector/views/organisms/MemberList.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/skins/vector/views/organisms/MemberList.js b/src/skins/vector/views/organisms/MemberList.js index 1cf0bf276e..1fd8c4d207 100644 --- a/src/skins/vector/views/organisms/MemberList.js +++ b/src/skins/vector/views/organisms/MemberList.js @@ -35,9 +35,13 @@ module.exports = React.createClass({ makeMemberTiles: function() { var MemberTile = sdk.getComponent("molecules.MemberTile"); + if (!self.memberDict) { + return null; + } + var self = this; - return Object.keys(self.state.memberDict).map(function(userId) { - var m = self.state.memberDict[userId]; + return Object.keys(self.memberDict).map(function(userId) { + var m = self.memberDict[userId]; return ( ); From 209889210b86bcd6b610657f13fe17c5e8db7251 Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 20 Oct 2015 12:36:10 +0100 Subject: [PATCH 02/12] Remove unnececessary and wrong null check --- src/skins/vector/views/organisms/MemberList.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/skins/vector/views/organisms/MemberList.js b/src/skins/vector/views/organisms/MemberList.js index 1fd8c4d207..f45d215d95 100644 --- a/src/skins/vector/views/organisms/MemberList.js +++ b/src/skins/vector/views/organisms/MemberList.js @@ -35,10 +35,6 @@ module.exports = React.createClass({ makeMemberTiles: function() { var MemberTile = sdk.getComponent("molecules.MemberTile"); - if (!self.memberDict) { - return null; - } - var self = this; return Object.keys(self.memberDict).map(function(userId) { var m = self.memberDict[userId]; From 044c75270fe51e6fdb37521d5e4bbd68f04deb98 Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 20 Oct 2015 12:41:16 +0100 Subject: [PATCH 03/12] This has changed in newer react sdk but in master, it should be state.memberDict --- src/skins/vector/views/organisms/MemberList.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/skins/vector/views/organisms/MemberList.js b/src/skins/vector/views/organisms/MemberList.js index f45d215d95..1cf0bf276e 100644 --- a/src/skins/vector/views/organisms/MemberList.js +++ b/src/skins/vector/views/organisms/MemberList.js @@ -36,8 +36,8 @@ module.exports = React.createClass({ var MemberTile = sdk.getComponent("molecules.MemberTile"); var self = this; - return Object.keys(self.memberDict).map(function(userId) { - var m = self.memberDict[userId]; + return Object.keys(self.state.memberDict).map(function(userId) { + var m = self.state.memberDict[userId]; return ( ); From 05dba9c2d4eb617d24424fd5e38c56f78a9f70df Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Tue, 27 Oct 2015 12:59:04 +0000 Subject: [PATCH 04/12] Fix inbound audio This was caused by an being the first thing in the
rather than the