From 9d0efedaee1e522e0fbc1300aee0c27e3ebf3eae Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Wed, 12 Nov 2014 11:14:19 +0000 Subject: Move room alias/id mapping logic from matrixService to modelService. --- syweb/webclient/room/room-controller.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'syweb/webclient/room') diff --git a/syweb/webclient/room/room-controller.js b/syweb/webclient/room/room-controller.js index be433d6e80..2a79fbfbbc 100644 --- a/syweb/webclient/room/room-controller.js +++ b/syweb/webclient/room/room-controller.js @@ -490,7 +490,7 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput', 'a // with or without port as is appropriate and append it at this point } - var room_id = matrixService.getAliasToRoomIdMapping(room_alias); + var room_id = modelService.getAliasToRoomIdMapping(room_alias); console.log("joining " + room_alias + " id=" + room_id); if ($scope.room) { // TODO actually check that you = join // don't send a join event for a room you're already in. @@ -677,7 +677,7 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput', 'a if (room_id_or_alias && '!' === room_id_or_alias[0]) { // Yes. We can go on right now $scope.room_id = room_id_or_alias; - $scope.room_alias = matrixService.getRoomIdToAliasMapping($scope.room_id); + $scope.room_alias = modelService.getRoomIdToAliasMapping($scope.room_id); onInit2(); } else { -- cgit 1.4.1