From 36da1acccaa5cdcd3fc82a9a90b5ebd32c1ca43e Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sun, 8 Nov 2015 12:14:10 +0000
Subject: [PATCH] click on CallView preview to jump to call
---
src/skins/vector/views/molecules/voip/CallView.js | 2 +-
src/skins/vector/views/molecules/voip/VideoView.js | 2 +-
src/skins/vector/views/organisms/LeftPanel.js | 12 +++++++++++-
3 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/skins/vector/views/molecules/voip/CallView.js b/src/skins/vector/views/molecules/voip/CallView.js
index 07987bd3..52297bbc 100644
--- a/src/skins/vector/views/molecules/voip/CallView.js
+++ b/src/skins/vector/views/molecules/voip/CallView.js
@@ -34,7 +34,7 @@ module.exports = React.createClass({
render: function(){
var VideoView = sdk.getComponent('molecules.voip.VideoView');
return (
- <VideoView ref="video"/>
+ <VideoView ref="video" onClick={ this.props.onClick }/>
);
}
});
diff --git a/src/skins/vector/views/molecules/voip/VideoView.js b/src/skins/vector/views/molecules/voip/VideoView.js
index 4e0fb913..e19f5704 100644
--- a/src/skins/vector/views/molecules/voip/VideoView.js
+++ b/src/skins/vector/views/molecules/voip/VideoView.js
@@ -78,7 +78,7 @@ module.exports = React.createClass({
render: function() {
var VideoFeed = sdk.getComponent('atoms.voip.VideoFeed');
return (
- <div className="mx_VideoView" ref={this.setContainer}>
+ <div className="mx_VideoView" ref={this.setContainer} onClick={ this.props.onClick }>
<div className="mx_VideoView_remoteVideoFeed">
<VideoFeed ref="remote"/>
<audio ref="remoteAudio"/>
diff --git a/src/skins/vector/views/organisms/LeftPanel.js b/src/skins/vector/views/organisms/LeftPanel.js
index 8f4b510a..668b844a 100644
--- a/src/skins/vector/views/organisms/LeftPanel.js
+++ b/src/skins/vector/views/organisms/LeftPanel.js
@@ -71,6 +71,16 @@ module.exports = React.createClass({
});
},
+ onCallViewClick: function() {
+ var call = CallHandler.getAnyActiveCall();
+ if (call) {
+ dis.dispatch({
+ action: 'view_room',
+ room_id: call.roomId,
+ });
+ }
+ },
+
render: function() {
var RoomList = sdk.getComponent('organisms.RoomList');
var BottomLeftMenu = sdk.getComponent('molecules.BottomLeftMenu');
@@ -89,7 +99,7 @@ module.exports = React.createClass({
var callPreview;
if (this.state.showCallElement) {
var CallView = sdk.getComponent('molecules.voip.CallView');
- callPreview = <CallView className="mx_LeftPanel_callView"/>
+ callPreview = <CallView className="mx_LeftPanel_callView" onClick={this.onCallViewClick} />
}
return (