imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move RoomList to react-sdk. Inject a ConferenceHandler.

Browse source
This commit is contained in:
Kegan Dougal 2015-11-30 16:56:05 +00:00
parent e792ebb837
commit 4e7aa78ed7
4 changed files with 6 additions and 329 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/skins/vector/views/organisms/LeftPanel.js
View file

@ -85,7 +85,7 @@ var LeftPanel = React.createClass({
},
render: function() {
var RoomList = sdk.getComponent('organisms.RoomList');
var RoomList = sdk.getComponent('rooms.RoomList');
var BottomLeftMenu = sdk.getComponent('molecules.BottomLeftMenu');
var IncomingCallBox = sdk.getComponent('voip.IncomingCallBox');
@ -114,7 +114,10 @@ var LeftPanel = React.createClass({
{ collapseButton }
<IncomingCallBox />
{ callPreview }
<RoomList selectedRoom={this.props.selectedRoom} collapsed={this.props.collapsed}/>
<RoomList
selectedRoom={this.props.selectedRoom}
collapsed={this.props.collapsed}
ConferenceHandler={VectorConferenceHandler} />
<BottomLeftMenu collapsed={this.props.collapsed}/>
</aside>
);