summary refs log tree commit diff
path: root/webclient/app-controller.js
diff options
context:
space:
mode:
authorDavid Baker <dbkr@matrix.org>2014-09-18 11:04:45 +0100
committerDavid Baker <dbkr@matrix.org>2014-09-18 11:04:45 +0100
commite932e5237eaea4c08e6f7bcd849e4be6bd2e3f98 (patch)
treeab22cc46fc524a81c986646a88c474cecfeaaca0 /webclient/app-controller.js
parentVideo calling (in a tiny box at the moment) (diff)
downloadsynapse-e932e5237eaea4c08e6f7bcd849e4be6bd2e3f98.tar.xz
WIP video chat layout
Diffstat (limited to 'webclient/app-controller.js')
-rw-r--r--webclient/app-controller.js7
1 files changed, 5 insertions, 2 deletions
diff --git a/webclient/app-controller.js b/webclient/app-controller.js

index e9912f886d..f63bb32f4f 100644 --- a/webclient/app-controller.js +++ b/webclient/app-controller.js
@@ -126,6 +126,7 @@ angular.module('MatrixWebClientController', ['matrixService', 'mPresence', 'even angular.element('#ringAudio')[0].pause(); angular.element('#ringbackAudio')[0].pause(); angular.element('#callendAudio')[0].play(); + $scope.videoMode = undefined; } else if (newVal == 'ended' && oldVal == 'invite_sent' && $rootScope.currentCall.hangupParty == 'remote') { angular.element('#ringAudio')[0].pause(); angular.element('#ringbackAudio')[0].pause(); @@ -138,6 +139,8 @@ angular.module('MatrixWebClientController', ['matrixService', 'mPresence', 'even angular.element('#ringbackAudio')[0].pause(); } else if (oldVal == 'ringing') { angular.element('#ringAudio')[0].pause(); + } else if (newVal == 'connected') { + $scope.videoMode = 'large'; } }); @@ -172,7 +175,7 @@ angular.module('MatrixWebClientController', ['matrixService', 'mPresence', 'even $rootScope.onCallError = function(errStr) { $scope.feedback = errStr; - } + }; $rootScope.onCallHangup = function(call) { if (call == $rootScope.currentCall) { @@ -180,5 +183,5 @@ angular.module('MatrixWebClientController', ['matrixService', 'mPresence', 'even if (call == $rootScope.currentCall) $rootScope.currentCall = undefined; }, 4070); } - } + }; }]);