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

Merge pull request #6 from matrix-org/voip

Browse source 
VoIP addition
This commit is contained in:
David Baker 2015-07-16 12:31:36 +01:00
commit a6f857e9d8
12 changed files with 527 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
skins/base/views/organisms/RoomView.js
View file

@ -26,6 +26,7 @@ var classNames = require("classnames");
var MessageTile = ComponentBroker.get('molecules/MessageTile');
var RoomHeader = ComponentBroker.get('molecules/RoomHeader');
var MessageComposer = ComponentBroker.get('molecules/MessageComposer');
var CallView = ComponentBroker.get("molecules/voip/CallView");
var RoomViewController = require("../../../../src/controllers/organisms/RoomView");
@ -73,7 +74,9 @@ module.exports = React.createClass({
return (
<div className="mx_RoomView">
<RoomHeader room={this.state.room} />
<div className="mx_RoomView_auxPanel"></div>
<div className="mx_RoomView_auxPanel">
<CallView room={this.state.room}/>
</div>
<div ref="messageWrapper" className="mx_RoomView_messagePanel" onScroll={this.onMessageListScroll}>
<div className="mx_RoomView_messageListWrapper">
<div className="mx_RoomView_MessageList" aria-live="polite">