Dispatch events when calls are made/received.

This commit is contained in:
Kegan Dougal 2015-07-15 14:06:44 +01:00
parent f94a061fda
commit 78bea916e1
5 changed files with 59 additions and 10 deletions

View file

@ -20,11 +20,12 @@ var React = require('react');
var MatrixClientPeg = require("../../../../src/MatrixClientPeg");
var ComponentBroker = require('../../../../src/ComponentBroker');
var VideoViewController = require("../../../../src/controllers/molecules/VideoView");
var VideoFeed = ComponentBroker.get('atoms/VideoFeed');
module.exports = React.createClass({
displayName: 'VideoView',
mixins: [VideoViewController],
getRemoteVideoElement: function() {
return this.refs.remote.getDOMNode();
@ -45,5 +46,5 @@ module.exports = React.createClass({
</div>
</div>
);
},
}
});

View file

@ -37,10 +37,6 @@ module.exports = React.createClass({
displayName: 'RoomView',
mixins: [RoomViewController],
getVideoView: function() {
return this.refs.video;
},
render: function() {
var myUserId = MatrixClientPeg.get().credentials.userId;
if (this.state.room.currentState.members[myUserId].membership == 'invite') {
@ -73,7 +69,7 @@ module.exports = React.createClass({
<div className="mx_RoomView">
<RoomHeader room={this.state.room} />
<div className="mx_RoomView_auxPanel">
<VideoView ref="video" />
<VideoView/>
</div>
<div ref="messageWrapper" className="mx_RoomView_messagePanel" onScroll={this.onMessageListScroll}>
<div className="mx_RoomView_messageListWrapper">