diff options
| author | Emmanuel ROHEE <erohee@amdocs.com> | 2014-08-18 17:41:23 +0200 |
|---|---|---|
| committer | Emmanuel ROHEE <erohee@amdocs.com> | 2014-08-18 17:41:23 +0200 |
| commit | f8693c6b481b7ee34b55e8ca68e0b4aebf3f9b03 (patch) | |
| tree | 84a8da11dda5f7d72d55c6d6faceec408a6f32ed /webclient/rooms/rooms-controller.js | |
| parent | Support urlencoded room aliases in room URL (diff) | |
| download | synapse-f8693c6b481b7ee34b55e8ca68e0b4aebf3f9b03.tar.xz | |
Join room: open the room URL with the room alias in it
Diffstat (limited to 'webclient/rooms/rooms-controller.js')
| -rw-r--r-- | webclient/rooms/rooms-controller.js | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/webclient/rooms/rooms-controller.js b/webclient/rooms/rooms-controller.js index da79c23d55..a237b59b4e 100644 --- a/webclient/rooms/rooms-controller.js +++ b/webclient/rooms/rooms-controller.js @@ -149,12 +149,8 @@ angular.module('RoomsController', ['matrixService', 'mFileInput', 'mFileUpload', $scope.joinAlias = function(room_alias) { matrixService.joinAlias(room_alias).then( function(response) { - if (response.data.hasOwnProperty("room_id")) { - $location.path("room/" + response.data.room_id); - return; - } else { - // TODO (erikj): Do something here? - } + // Go to this room + $location.path("room/" + room_alias); }, function(error) { $scope.feedback = "Can't join room: " + error.data; |