summary refs log tree commit diff
path: root/webclient/components
diff options
context:
space:
mode:
authorErik Johnston <erikj@matrix.org>2014-08-12 17:17:10 +0100
committerErik Johnston <erikj@matrix.org>2014-08-12 17:17:14 +0100
commitfe3c5a27268d207e29be214c795da9bb756edb86 (patch)
treef0d7c312f7cf13c220974bfb0d50423b9411bbdb /webclient/components
parentJust say yes to OPTIONS requests, since we want to turn on CORS headers for a... (diff)
downloadsynapse-fe3c5a27268d207e29be214c795da9bb756edb86.tar.xz
Fix the 'Go to room' button to use the correct room alias api
Diffstat (limited to 'webclient/components')
-rw-r--r--webclient/components/matrix/matrix-service.js9
1 files changed, 9 insertions, 0 deletions
diff --git a/webclient/components/matrix/matrix-service.js b/webclient/components/matrix/matrix-service.js

index bbfffe75e7..f98874dc74 100644 --- a/webclient/components/matrix/matrix-service.js +++ b/webclient/components/matrix/matrix-service.js
@@ -111,6 +111,15 @@ angular.module('matrixService', []) }); }, + joinAlias: function(room_alias) { + var path = "/join/$room_alias"; + room_alias = encodeURIComponent(room_alias); + + path = path.replace("$room_alias", room_alias); + + return doRequest("PUT", path, undefined, {}); + }, + // Invite a user to a room invite: function(room_id, user_id) { // The REST path spec