summary refs log tree commit diff
path: root/webclient/room/room.html
diff options
context:
space:
mode:
authorDavid Baker <dbkr@matrix.org>2014-08-29 14:01:30 +0100
committerDavid Baker <dbkr@matrix.org>2014-08-29 14:01:30 +0100
commite76cd252feeb7a4ab493ef595db29356ff34b98d (patch)
tree7a75b8a231ffbaaa331d34085074b00c5dd3acb2 /webclient/room/room.html
parentMerge branch 'develop' of github.com:matrix-org/synapse into develop (diff)
parentOnly show voice call button if there are exactly 2 members in the room. Also ... (diff)
downloadsynapse-e76cd252feeb7a4ab493ef595db29356ff34b98d.tar.xz
Merge branch 'release-v0.1.0' into develop
Diffstat (limited to 'webclient/room/room.html')
-rw-r--r--webclient/room/room.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/webclient/room/room.html b/webclient/room/room.html

index 572c52e64e..a3514c3a91 100644 --- a/webclient/room/room.html +++ b/webclient/room/room.html
@@ -98,14 +98,14 @@ <button ng-click="inviteUser(userIDToInvite)">Invite</button> </span> <button ng-click="leaveRoom()">Leave</button> - <button ng-click="startVoiceCall()" ng-show="currentCall == undefined">Voice Call</button> + <button ng-click="startVoiceCall()" ng-show="currentCall == undefined && memberCount() == 2">Voice Call</button> <div ng-show="currentCall.state == 'ringing'"> Incoming call from {{ currentCall.user_id }} <button ng-click="answerCall()">Answer</button> <button ng-click="hangupCall()">Reject</button> </div> <button ng-click="hangupCall()" ng-show="currentCall && currentCall.state != 'ringing'">Hang up</button> - {{ currentCall.state }} + <span style="display: none; ">{{ currentCall.state }}</span> </div> {{ feedback }}