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

Add onClick listeners. Add getters for refs.

Browse source
This commit is contained in:
Kegan Dougal 2015-07-15 13:34:11 +01:00
parent aba103b8e0
commit f94a061fda
6 changed files with 19 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
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 VideoView = ComponentBroker.get("molecules/VideoView");
var RoomViewController = require("../../../../src/controllers/organisms/RoomView");
@ -36,6 +37,10 @@ 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') {
@ -67,7 +72,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">
<VideoView ref="video" />
</div>
<div ref="messageWrapper" className="mx_RoomView_messagePanel" onScroll={this.onMessageListScroll}>
<div className="mx_RoomView_messageListWrapper">
<div className="mx_RoomView_MessageList" aria-live="polite">

49
skins/base/views/organisms/VideoView.js
View file

@ -1,49 +0,0 @@
/*
Copyright 2015 OpenMarket Ltd
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
'use strict';
var React = require('react');
var MatrixClientPeg = require("../../../../src/MatrixClientPeg");
var ComponentBroker = require('../../../../src/ComponentBroker');
var VideoFeed = ComponentBroker.get('atoms/VideoFeed');
module.exports = React.createClass({
displayName: 'VideoView',
getRemoteVideoElement: function() {
return this.refs.remote.getDOMNode();
},
getLocalVideoElement: function() {
return this.refs.local.getDOMNode();
},
render: function() {
return (
<div>
<div>
<VideoFeed ref="remote"/>
</div>
<div>
<VideoFeed ref="local"/>
</div>
</div>
);
},
});