OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Hangup call if user denies media access.

pull/10/head
David Baker 2014-09-09 18:21:03 +01:00
parent ccfb42e4ff
commit f90ce04a83
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
webclient/app-controller.js
View File

@ -142,14 +142,6 @@ angular.module('MatrixWebClientController', ['matrixService', 'mPresence', 'even
$scope.hangupCall = function() { $scope.hangupCall = function() {
$rootScope.currentCall.hangup(); $rootScope.currentCall.hangup();
$timeout(function() {
var icon = angular.element('#callEndedIcon');
$animate.addClass(icon, 'callIconRotate');
$timeout(function(){
$rootScope.currentCall = undefined;
}, 4070);
}, 100);
}; };
$rootScope.onCallError = function(errStr) { $rootScope.onCallError = function(errStr) {

2
webclient/components/matrix/matrix-call.js
View File

@ -114,6 +114,7 @@ angular.module('MatrixCall', [])
}; };
matrixService.sendEvent(this.room_id, 'm.call.hangup', undefined, content).then(this.messageSent, this.messageSendFailed); matrixService.sendEvent(this.room_id, 'm.call.hangup', undefined, content).then(this.messageSent, this.messageSendFailed);
this.state = 'ended'; this.state = 'ended';
self.onHangup();
}; };
MatrixCall.prototype.gotUserMediaForInvite = function(stream) { MatrixCall.prototype.gotUserMediaForInvite = function(stream) {
@ -233,6 +234,7 @@ angular.module('MatrixCall', [])
MatrixCall.prototype.getUserMediaFailed = function() { MatrixCall.prototype.getUserMediaFailed = function() {
this.onError("Couldn't start capturing audio! Is your microphone set up?"); this.onError("Couldn't start capturing audio! Is your microphone set up?");
this.hangup();
}; };
MatrixCall.prototype.onIceConnectionStateChanged = function() { MatrixCall.prototype.onIceConnectionStateChanged = function() {