diff options
| author | David Baker <dbkr@matrix.org> | 2014-09-19 16:52:45 +0100 |
|---|---|---|
| committer | David Baker <dbkr@matrix.org> | 2014-09-19 16:52:45 +0100 |
| commit | 29686f63ac9f9b47b94cb09f6f90fab0bcf848c4 (patch) | |
| tree | 9777a7ead70c7ced070d583d8dd208e77f9a945e /webclient | |
| parent | Test that prev_content get's added if there is a prev_state key (in the event... (diff) | |
| download | synapse-29686f63ac9f9b47b94cb09f6f90fab0bcf848c4.tar.xz | |
Fix the "is webrtc supported" titles on buttons and make the video / voice call buttons appear in multi-user rooms but be greyed out with approriate titles.
Diffstat (limited to 'webclient')
| -rw-r--r-- | webclient/room/room.html | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/webclient/room/room.html b/webclient/room/room.html index 07b74248a8..dfbea492d9 100644 --- a/webclient/room/room.html +++ b/webclient/room/room.html @@ -177,16 +177,16 @@ </span> <button ng-click="leaveRoom()" ng-disabled="state.permission_denied">Leave</button> <button ng-click="startVoiceCall()" - ng-show="(currentCall == undefined || currentCall.state == 'ended') && memberCount() == 2" - ng-disabled="state.permission_denied || !state.webRTCSupported" - title ="{{ state.webRTCNotSupported ? '' : 'VoIP requires webRTC but your browser does not support it.'}}" + ng-show="(currentCall == undefined || currentCall.state == 'ended')" + ng-disabled="state.permission_denied || !state.webRTCSupported || memberCount() != 2" + title ="{{ !state.webRTCSupported ? 'VoIP requires webRTC but your browser does not support it' : (memberCount() == 2 ? '' : 'VoIP calls can only be made in rooms with two participants') }}" > Voice Call </button> <button ng-click="startVideoCall()" - ng-show="(currentCall == undefined || currentCall.state == 'ended') && memberCount() == 2" - ng-disabled="state.permission_denied || !state.webRTCSupported" - title ="{{ state.webRTCNotSupported ? '' : 'VoIP requires webRTC but your browser does not support it.'}}" + ng-show="(currentCall == undefined || currentCall.state == 'ended')" + ng-disabled="state.permission_denied || !state.webRTCSupported || memberCount() != 2" + title ="{{ !state.webRTCSupported ? 'VoIP requires webRTC but your browser does not support it' : (memberCount() == 2 ? '' : 'VoIP calls can only be made in rooms with two participants') }}" > Video Call </button> |