diff options
author | David Baker <dbkr@matrix.org> | 2014-08-29 13:23:01 +0100 |
---|---|---|
committer | David Baker <dbkr@matrix.org> | 2014-08-29 13:23:01 +0100 |
commit | 5308e3026a088be2c0c0edc406053fe192e827c2 (patch) | |
tree | 75de1065db178ffe0758316793fec4d0c429fbdd /webclient/room | |
parent | Merge branch 'voip' into develop (diff) | |
download | synapse-5308e3026a088be2c0c0edc406053fe192e827c2.tar.xz |
Change call signalling messages to be their own types of room events rather than room messages with different msgtypes: room messages should be things that the client can display as a unit message to the user.
Diffstat (limited to '')
-rw-r--r-- | webclient/room/room-controller.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/webclient/room/room-controller.js b/webclient/room/room-controller.js index 15710d2ba3..8bb48b3692 100644 --- a/webclient/room/room-controller.js +++ b/webclient/room/room-controller.js @@ -83,7 +83,7 @@ angular.module('RoomController', ['ngSanitize', 'mFileInput']) updatePresence(event); }); - $rootScope.$on(matrixPhoneService.CALL_EVENT, function(ngEvent, call) { + $rootScope.$on(matrixPhoneService.INCOMING_CALL_EVENT, function(ngEvent, call) { console.trace("incoming call"); call.onError = $scope.onCallError; call.onHangup = $scope.onCallHangup; |