diff options
Diffstat (limited to '')
| -rw-r--r-- | webclient/app-controller.js | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/webclient/app-controller.js b/webclient/app-controller.js index 8383533cfb..945f71ed20 100644 --- a/webclient/app-controller.js +++ b/webclient/app-controller.js @@ -135,9 +135,9 @@ angular.module('MatrixWebClientController', ['matrixService', 'mPresence', 'even }); $rootScope.$on(matrixPhoneService.INCOMING_CALL_EVENT, function(ngEvent, call) { - console.trace("incoming call"); + console.log("incoming call"); if ($rootScope.currentCall && $rootScope.currentCall.state != 'ended') { - console.trace("rejecting call because we're already in a call"); + console.log("rejecting call because we're already in a call"); call.hangup(); return; } @@ -146,6 +146,13 @@ angular.module('MatrixWebClientController', ['matrixService', 'mPresence', 'even $rootScope.currentCall = call; }); + $rootScope.$on(matrixPhoneService.REPLACED_CALL_EVENT, function(ngEvent, oldCall, newCall) { + console.log("call ID "+oldCall+" has been replaced by call ID "+newCall+"!"); + newCall.onError = $scope.onCallError; + newCall.onHangup = $scope.onCallHangup; + $rootScope.currentCall = newCall; + }); + $scope.answerCall = function() { $rootScope.currentCall.answer(); }; @@ -161,7 +168,7 @@ angular.module('MatrixWebClientController', ['matrixService', 'mPresence', 'even $rootScope.onCallHangup = function(call) { if (call == $rootScope.currentCall) { $timeout(function(){ - $rootScope.currentCall = undefined; + if (call == $rootScope.currentCall) $rootScope.currentCall = undefined; }, 4070); } } |