summary refs log tree commit diff
path: root/syweb/webclient/room
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2014-11-12 11:14:19 +0000
committerKegan Dougal <kegan@matrix.org>2014-11-12 11:14:19 +0000
commit9d0efedaee1e522e0fbc1300aee0c27e3ebf3eae (patch)
treec31d39a5c4f1f8a44693514a061f2028623bc6fb /syweb/webclient/room
parentmove model/ into matrix-doc/drafts (diff)
downloadsynapse-9d0efedaee1e522e0fbc1300aee0c27e3ebf3eae.tar.xz
Move room alias/id mapping logic from matrixService to modelService.
Diffstat (limited to 'syweb/webclient/room')
-rw-r--r--syweb/webclient/room/room-controller.js4
1 files changed, 2 insertions, 2 deletions
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 {