gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'vector' of github.com:matrix-org/matrix-react-sdk into vector

This commit is contained in:
David Baker 2015-07-17 14:36:15 +01:00
parent 9a79539978 5c6b8a4cf9
commit 383a958abe
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/CallHandler.js
View File

@ -175,6 +175,10 @@ dis.register(function(payload) {
}
calls[payload.room_id].answer();
_setCallState(calls[payload.room_id], payload.room_id, "connected");
dis.dispatch({
action: "view_room",
room_id: payload.room_id
});
break;
}
});

2
src/controllers/molecules/MessageComposer.js
View File

@ -30,7 +30,6 @@ var KeyCode = {
module.exports = {
componentWillMount: function() {
this.dispatcherRef = dis.register(this.onAction);
this.tabStruct = {
completing: false,
original: null,
@ -126,6 +125,7 @@ module.exports = {
},
componentDidMount: function() {
this.dispatcherRef = dis.register(this.onAction);
this.sentHistory.init(
this.refs.textarea.getDOMNode(),
this.props.room.roomId

14
src/controllers/molecules/voip/CallView.js
View File

@ -30,9 +30,9 @@ module.exports = {
componentDidMount: function() {
this.dispatcherRef = dis.register(this.onAction);
this.setState({
call: null
});
if (this.props.room) {
this.showCall(this.props.room.roomId);
}
},
componentWillUnmount: function() {
@ -48,8 +48,12 @@ module.exports = {
if (payload.action !== 'call_state') {
return;
}
var call = CallHandler.getCall(payload.room_id);
if (call && call.type === "video") {
this.showCall(payload.room_id);
},
showCall: function(roomId) {
var call = CallHandler.getCall(roomId);
if (call && call.type === "video" && call.state !== 'ended') {
this.getVideoView().getLocalVideoElement().style.display = "initial";
this.getVideoView().getRemoteVideoElement().style.display = "initial";
call.setLocalVideoElement(this.getVideoView().getLocalVideoElement());