summary refs log tree commit diff
path: root/syweb/webclient/components
diff options
context:
space:
mode:
authorDavid Baker <dbkr@matrix.org>2014-11-13 14:34:03 +0000
committerDavid Baker <dbkr@matrix.org>2014-11-13 14:34:03 +0000
commitf842bca471ec19fb0fcf8e71536b113983896140 (patch)
tree566343999646fb997aa8fad2b05b8eb5410b943f /syweb/webclient/components
parentThis gives just enough space for the vertical scrollbar to be shown without a... (diff)
downloadsynapse-f842bca471ec19fb0fcf8e71536b113983896140.tar.xz
Kill ng-animate with fire because it's terrible (was causing the page to be very sluggish). Do the call icons in pure CSS3 and use one less image to boot (in some browsers the phone icon will be the wrong browser but they can deal).
Diffstat (limited to '')
-rw-r--r--syweb/webclient/components/matrix/matrix-call.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/syweb/webclient/components/matrix/matrix-call.js b/syweb/webclient/components/matrix/matrix-call.js

index a1c3aaa103..56431817d9 100644 --- a/syweb/webclient/components/matrix/matrix-call.js +++ b/syweb/webclient/components/matrix/matrix-call.js
@@ -112,7 +112,7 @@ angular.module('MatrixCall', []) } else { var iceServers = []; // https://github.com/EricssonResearch/openwebrtc/issues/85 - if (MatrixCall.turnServer /*&& !this.isOpenWebRTC()*/) { + if (MatrixCall.turnServer && !this.isOpenWebRTC()) { if (MatrixCall.turnServer.uris) { iceServers.push({ 'urls': MatrixCall.turnServer.uris,