diff options
| author | Erik Johnston <erik@matrix.org> | 2014-08-19 14:48:19 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-08-19 14:48:19 +0100 |
| commit | 347242a5c408d4ceb1880f6b90c8e9c658226dde (patch) | |
| tree | 12a25b72d8f13a48f99441c249c3c531c79fff66 /webclient/rooms/rooms-controller.js | |
| parent | Fix bug where we sometimes set min_token to None. (diff) | |
| parent | Proofing (diff) | |
| download | synapse-347242a5c408d4ceb1880f6b90c8e9c658226dde.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor
Conflicts: tests/rest/test_presence.py tests/rest/test_rooms.py tests/utils.py
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; |