summary refs log tree commit diff
path: root/syweb/webclient/app-controller.js
diff options
context:
space:
mode:
authorDavid Baker <dbkr@matrix.org>2014-11-07 17:56:28 +0000
committerDavid Baker <dbkr@matrix.org>2014-11-07 17:56:28 +0000
commit7d15452c3037b887a85d0b65916de90b2d2c4573 (patch)
tree244d8c28c07ea4043e6e4dd1478d8b25722a663c /syweb/webclient/app-controller.js
parentDetect call type by examining the SDP always rather than just in Firefox as i... (diff)
downloadsynapse-7d15452c3037b887a85d0b65916de90b2d2c4573.tar.xz
Various fixes to try & make openwebrtc safari extension work (still doesn't work).
Diffstat (limited to 'syweb/webclient/app-controller.js')
-rw-r--r--syweb/webclient/app-controller.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/syweb/webclient/app-controller.js b/syweb/webclient/app-controller.js

index 2d82a42cf8..bbcf4ab5f6 100644 --- a/syweb/webclient/app-controller.js +++ b/syweb/webclient/app-controller.js
@@ -112,8 +112,8 @@ angular.module('MatrixWebClientController', ['matrixService', 'mPresence', 'even if (!$rootScope.currentCall) { // This causes the still frame to be flushed out of the video elements, // avoiding a flash of the last frame of the previous call when starting the next - angular.element('#localVideo')[0].load(); - angular.element('#remoteVideo')[0].load(); + if (angular.element('#localVideo')[0].load) angular.element('#localVideo')[0].load(); + if (angular.element('#remoteVideo')[0].load) angular.element('#remoteVideo')[0].load(); return; } @@ -187,8 +187,8 @@ angular.module('MatrixWebClientController', ['matrixService', 'mPresence', 'even } call.onError = $scope.onCallError; call.onHangup = $scope.onCallHangup; - call.localVideoElement = angular.element('#localVideo')[0]; - call.remoteVideoElement = angular.element('#remoteVideo')[0]; + call.localVideoSelector = '#localVideo'; + call.remoteVideoSelector = '#remoteVideo'; $rootScope.currentCall = call; });