summary refs log tree commit diff
path: root/webclient/room/room-controller.js
diff options
context:
space:
mode:
authorDavid Baker <dbkr@matrix.org>2014-09-09 17:37:50 +0100
committerDavid Baker <dbkr@matrix.org>2014-09-09 17:38:40 +0100
commit253c327252a3455aa5ce3a3147e19406a4d67615 (patch)
tree88c7d31cc37c229a50bf0af8f6b9fffb98ad0141 /webclient/room/room-controller.js
parentFix bug where we used an unbound local variable if we ended up rolling back t... (diff)
downloadsynapse-253c327252a3455aa5ce3a3147e19406a4d67615.tar.xz
Don't play an engaged tone if we hang up locally.
Diffstat (limited to 'webclient/room/room-controller.js')
-rw-r--r--webclient/room/room-controller.js10
1 files changed, 9 insertions, 1 deletions
diff --git a/webclient/room/room-controller.js b/webclient/room/room-controller.js

index 59f64061cd..3d75ef5499 100644 --- a/webclient/room/room-controller.js +++ b/webclient/room/room-controller.js
@@ -756,7 +756,15 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput']) var call = new MatrixCall($scope.room_id); call.onError = $rootScope.onCallError; call.onHangup = $rootScope.onCallHangup; - call.placeCall(); + call.placeCall({audio: true, video: false}); + $rootScope.currentCall = call; + }; + + $scope.startVideoCall = function() { + var call = new MatrixCall($scope.room_id); + call.onError = $rootScope.onCallError; + call.onHangup = $rootScope.onCallHangup; + call.placeCall({audio: true, video: true}); $rootScope.currentCall = call; };