From fdfd6ecfd9d6890e90c4931ac0afb90627f286b6 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sat, 3 Sep 2016 13:27:46 +0100
Subject: [PATCH] let users join confs as voice or video

---
 src/components/views/rooms/AuxPanel.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/components/views/rooms/AuxPanel.js b/src/components/views/rooms/AuxPanel.js
index 10a411aea9..4eaa19193e 100644
--- a/src/components/views/rooms/AuxPanel.js
+++ b/src/components/views/rooms/AuxPanel.js
@@ -57,12 +57,14 @@ module.exports = React.createClass({
         }
     },
 
-    onConferenceNotificationClick: function(type) {
+    onConferenceNotificationClick: function(ev, type) {
         dis.dispatch({
             action: 'place_call',
             type: type,
             room_id: this.props.room.roomId,
         });
+        ev.stopPropagation();
+        ev.preventDefault();
     },
 
     render: function() {
@@ -91,7 +93,8 @@ module.exports = React.createClass({
             }
             else {
                 joinText = (<span>
-                    Join as <a onClick={this.onConferenceNotificationClick.bind(this, 'voice')} href="#">voice</a> or <a onClick={this.onConferenceNotificationClick.bind(this, 'video')} href="#">video</a>.
+                    Join as <a onClick={(event)=>{ this.onConferenceNotificationClick(event, 'voice')}} href="#">voice</a>&nbsp;
+                    or <a onClick={(event)=>{ this.onConferenceNotificationClick(event, 'video') }} href="#">video</a>.
                 </span>);
 
             }