diff options
| author | David Baker <dbkr@matrix.org> | 2014-09-16 14:46:13 +0100 |
|---|---|---|
| committer | David Baker <dbkr@matrix.org> | 2014-09-16 14:47:10 +0100 |
| commit | dd2b933a0d92f24421a56ec350ae0f80e32d2d3e (patch) | |
| tree | 38c374cae7631e18892432bfc15527ada2d41059 /webclient/app-controller.js | |
| parent | Comment out password reset for now, until the mechanism is fully discussed (I... (diff) | |
| download | synapse-dd2b933a0d92f24421a56ec350ae0f80e32d2d3e.tar.xz | |
Use event age to recognise which calls are current and which aren't and hence support answering calls that were placed before we loaded the page.
Diffstat (limited to 'webclient/app-controller.js')
| -rw-r--r-- | webclient/app-controller.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/webclient/app-controller.js b/webclient/app-controller.js index 6c3759878b..6338624486 100644 --- a/webclient/app-controller.js +++ b/webclient/app-controller.js @@ -130,6 +130,10 @@ angular.module('MatrixWebClientController', ['matrixService', 'mPresence', 'even angular.element('#ringAudio')[0].pause(); angular.element('#ringbackAudio')[0].pause(); angular.element('#busyAudio')[0].play(); + } else if (newVal == 'ended' && oldVal == 'invite_sent' && $rootScope.currentCall.hangupParty == 'local' && $rootScope.currentCall.hangupReason == 'invite_timeout') { + angular.element('#ringAudio')[0].pause(); + angular.element('#ringbackAudio')[0].pause(); + angular.element('#busyAudio')[0].play(); } else if (oldVal == 'invite_sent') { angular.element('#ringbackAudio')[0].pause(); } else if (oldVal == 'ringing') { |