mad-star-studio/element-web
2
0
Fork 0
Code Pull requests Activity

Wire up the "room" CallView for conferencing

Browse source 
This also separates out concerns better - UI elements just need to poke
getCallForRoom rather than care if the thing they are displaying is a
true 1:1 for this room ID or actually a conf room.
This commit is contained in:
Kegan Dougal 2015-09-15 13:19:07 +01:00
parent 7866979c79
commit 353269370f
4 changed files with 32 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

3
skins/base/views/pages/MatrixChat.js
View file

@ -80,7 +80,8 @@ module.exports = React.createClass({
// active call, show the call element - we need to do this to make
// audio/video not crap out
if (this.state.active_call && (
!this.state.currentRoom || !CallHandler.getCall(this.state.currentRoom))) {
!this.state.currentRoom ||
!CallHandler.getCallForRoom(this.state.currentRoom))) {
console.log(
"Creating global CallView for active call in room %s",
this.state.active_call.roomId