From f8693c6b481b7ee34b55e8ca68e0b4aebf3f9b03 Mon Sep 17 00:00:00 2001
From: Emmanuel ROHEE <erohee@amdocs.com>
Date: Mon, 18 Aug 2014 17:41:23 +0200
Subject: Join room: open the room URL with the room alias in it

---
 webclient/rooms/rooms-controller.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'webclient/rooms/rooms-controller.js')

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;
-- 
cgit 1.4.1