diff options
| author | Kegan Dougal <kegan@matrix.org> | 2014-11-03 10:33:38 +0000 |
|---|---|---|
| committer | Kegan Dougal <kegan@matrix.org> | 2014-11-03 10:33:38 +0000 |
| commit | 53da1099d132e96f9b4933a3eab1d34ba62c47d4 (patch) | |
| tree | ce8cbdda11b1a3eabe0ddfff7e08d161f633b8f6 | |
| parent | Keep matrixService stateless and make matrixFilter use modelService. (diff) | |
| download | synapse-53da1099d132e96f9b4933a3eab1d34ba62c47d4.tar.xz | |
Make call stuff use modelService.
| -rw-r--r-- | webclient/app-controller.js | 6 | ||||
| -rw-r--r-- | webclient/components/matrix/matrix-call.js | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/webclient/app-controller.js b/webclient/app-controller.js index e4b7cd286f..2d82a42cf8 100644 --- a/webclient/app-controller.js +++ b/webclient/app-controller.js @@ -21,8 +21,8 @@ limitations under the License. 'use strict'; angular.module('MatrixWebClientController', ['matrixService', 'mPresence', 'eventStreamService']) -.controller('MatrixWebClientController', ['$scope', '$location', '$rootScope', '$timeout', '$animate', 'matrixService', 'mPresence', 'eventStreamService', 'eventHandlerService', 'matrixPhoneService', - function($scope, $location, $rootScope, $timeout, $animate, matrixService, mPresence, eventStreamService, eventHandlerService, matrixPhoneService) { +.controller('MatrixWebClientController', ['$scope', '$location', '$rootScope', '$timeout', '$animate', 'matrixService', 'mPresence', 'eventStreamService', 'eventHandlerService', 'matrixPhoneService', 'modelService', + function($scope, $location, $rootScope, $timeout, $animate, matrixService, mPresence, eventStreamService, eventHandlerService, matrixPhoneService, modelService) { // Check current URL to avoid to display the logout button on the login page $scope.location = $location.path(); @@ -117,7 +117,7 @@ angular.module('MatrixWebClientController', ['matrixService', 'mPresence', 'even return; } - var roomMembers = angular.copy($rootScope.events.rooms[$rootScope.currentCall.room_id].members); + var roomMembers = angular.copy(modelService.getRoom($rootScope.currentCall.room_id).current_room_state.members); delete roomMembers[matrixService.config().user_id]; $rootScope.currentCall.user_id = Object.keys(roomMembers)[0]; diff --git a/webclient/components/matrix/matrix-call.js b/webclient/components/matrix/matrix-call.js index 3e8811e5fc..5a2807c755 100644 --- a/webclient/components/matrix/matrix-call.js +++ b/webclient/components/matrix/matrix-call.js @@ -46,7 +46,7 @@ var isWebRTCSupported = function () { }; angular.module('MatrixCall', []) -.factory('MatrixCall', ['matrixService', 'matrixPhoneService', '$rootScope', '$timeout', function MatrixCallFactory(matrixService, matrixPhoneService, $rootScope, $timeout) { +.factory('MatrixCall', ['matrixService', 'matrixPhoneService', 'modelService', '$rootScope', '$timeout', function MatrixCallFactory(matrixService, matrixPhoneService, modelService, $rootScope, $timeout) { $rootScope.isWebRTCSupported = isWebRTCSupported(); var MatrixCall = function(room_id) { @@ -213,7 +213,7 @@ angular.module('MatrixCall', []) var self = this; - var roomMembers = $rootScope.events.rooms[this.room_id].members; + var roomMembers = modelService.getRoom(this.room_id).current_room_state.members; if (roomMembers[matrixService.config().user_id].membership != 'join') { console.log("We need to join the room before we can accept this call"); matrixService.join(this.room_id).then(function() { |