From f89fbffe89a960af373153f2019dc5d78e09fd1e Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Tue, 15 Sep 2015 15:55:02 +0100 Subject: [PATCH] Auto-place a video call if the conf notification is clicked --- skins/base/views/organisms/RoomView.js | 2 +- src/controllers/organisms/RoomView.js | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/skins/base/views/organisms/RoomView.js b/skins/base/views/organisms/RoomView.js index 0f1fe1afa8..b6747ae7f8 100644 --- a/skins/base/views/organisms/RoomView.js +++ b/skins/base/views/organisms/RoomView.js @@ -179,7 +179,7 @@ module.exports = React.createClass({ var conferenceCallNotification = null; if (this.state.displayConfCallNotification) { conferenceCallNotification = ( -
+
Ongoing conference call
); diff --git a/src/controllers/organisms/RoomView.js b/src/controllers/organisms/RoomView.js index 1856cac992..c6881de36a 100644 --- a/src/controllers/organisms/RoomView.js +++ b/src/controllers/organisms/RoomView.js @@ -206,6 +206,14 @@ module.exports = { }); }, + onConferenceNotificationClick: function() { + dis.dispatch({ + action: 'place_call', + type: "video", + room_id: this.props.roomId + }); + }, + componentDidMount: function() { if (this.refs.messageWrapper) { var messageWrapper = this.refs.messageWrapper.getDOMNode();