diff options
| author | David Baker <dbkr@matrix.org> | 2014-11-06 16:48:01 +0000 |
|---|---|---|
| committer | David Baker <dbkr@matrix.org> | 2014-11-06 16:49:33 +0000 |
| commit | 4b256cab317ab02da549ce64a33911743f1b9d6f (patch) | |
| tree | 3acfb9e620dfe30bac0c1ca65b2d89c5dd007eed /syweb/webclient/room | |
| parent | Swap from using raw m.room.member events for room members to using actual Roo... (diff) | |
| download | synapse-4b256cab317ab02da549ce64a33911743f1b9d6f.tar.xz | |
Don't cache isWebRTCSupported because whether webRTC is supported might change part-way through the page's lifecycle if your webrtc support comes from some kind of injected content script (hello OpenWebRTC Sarafi extension)
Diffstat (limited to 'syweb/webclient/room')
| -rw-r--r-- | syweb/webclient/room/room.html | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/syweb/webclient/room/room.html b/syweb/webclient/room/room.html index ca5669a732..e59cc30edc 100644 --- a/syweb/webclient/room/room.html +++ b/syweb/webclient/room/room.html @@ -182,8 +182,8 @@ (msg.content.formatted_body | unsanitizedLinky) : (msg.content.msgtype === 'm.text' && msg.type === 'm.room.message') ? (msg.content.body | linky:'_blank') : '' "/> - <span ng-show='msg.type === "m.call.invite" && msg.user_id == state.user_id'>Outgoing Call{{ isWebRTCSupported ? '' : ' (But your browser does not support VoIP)' }}</span> - <span ng-show='msg.type === "m.call.invite" && msg.user_id != state.user_id'>Incoming Call{{ isWebRTCSupported ? '' : ' (But your browser does not support VoIP)' }}</span> + <span ng-show='msg.type === "m.call.invite" && msg.user_id == state.user_id'>Outgoing Call{{ isWebRTCSupported() ? '' : ' (But your browser does not support VoIP)' }}</span> + <span ng-show='msg.type === "m.call.invite" && msg.user_id != state.user_id'>Incoming Call{{ isWebRTCSupported() ? '' : ' (But your browser does not support VoIP)' }}</span> <div ng-show='msg.content.msgtype === "m.image"'> <div ng-hide='msg.content.thumbnail_url' ng-style="msg.content.body.h && { 'height' : (msg.content.body.h < 320) ? msg.content.body.h : 320}"> @@ -248,15 +248,15 @@ <button ng-click="leaveRoom()" ng-disabled="state.permission_denied">Leave</button> <button ng-click="startVoiceCall()" ng-show="(currentCall == undefined || currentCall.state == 'ended')" - ng-disabled="state.permission_denied || !isWebRTCSupported || memberCount() != 2" - title ="{{ !isWebRTCSupported ? 'VoIP requires webRTC but your browser does not support it' : (memberCount() == 2 ? '' : 'VoIP calls can only be made in rooms with two participants') }}" + ng-disabled="state.permission_denied || !isWebRTCSupported() || memberCount() != 2" + title ="{{ !isWebRTCSupported() ? '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')" - ng-disabled="state.permission_denied || !isWebRTCSupported || memberCount() != 2" - title ="{{ !isWebRTCSupported ? 'VoIP requires webRTC but your browser does not support it' : (memberCount() == 2 ? '' : 'VoIP calls can only be made in rooms with two participants') }}" + ng-disabled="state.permission_denied || !isWebRTCSupported() || memberCount() != 2" + title ="{{ !isWebRTCSupported() ? '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> |