summary refs log tree commit diff
path: root/webclient/app.js
diff options
context:
space:
mode:
authorEmmanuel ROHEE <erohee@amdocs.com>2014-08-18 17:40:05 +0200
committerEmmanuel ROHEE <erohee@amdocs.com>2014-08-18 17:40:05 +0200
commit43772d0b15f749e2e4356097560cca3c86e1e4e6 (patch)
treeb2069355d72e6a55c33c52d8cc917adeede5b4b6 /webclient/app.js
parentIf possible, use href with room alias in rooms list (diff)
downloadsynapse-43772d0b15f749e2e4356097560cca3c86e1e4e6.tar.xz
Support urlencoded room aliases in room URL
Diffstat (limited to 'webclient/app.js')
-rw-r--r--webclient/app.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/webclient/app.js b/webclient/app.js
index 193c11d461..a3d1505f81 100644
--- a/webclient/app.js
+++ b/webclient/app.js
@@ -33,13 +33,13 @@ matrixWebClient.config(['$routeProvider', '$provide', '$httpProvider',
                 templateUrl: 'login/login.html',
                 controller: 'LoginController'
             }).
-            when('/room/:room_id', {
+            when('/room/:room_id_or_alias', {
                 templateUrl: 'room/room.html',
                 controller: 'RoomController'
             }).
             when('/room/', {    // room URL with room alias in it (ex: http://127.0.0.1:8000/#/room/#public:localhost:8080) will come here.
                                 // The reason is that 2nd hash key breaks routeProvider parameters cutting so that the URL will not match with 
-                                // the previous '/room/:room_id' URL rule
+                                // the previous '/room/:room_id_or_alias' URL rule
                 templateUrl: 'room/room.html',
                 controller: 'RoomController'
             }).