diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-08-31 16:08:20 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-08-31 16:08:20 +0100 |
| commit | 3eb45eba0e387dacb67158efe323f19731799c79 (patch) | |
| tree | 79d942de91b8c9a940e787da9b4a329047139a80 /webclient/home | |
| parent | Add store for server certificates and keys (diff) | |
| parent | Add config tree to synapse. Add support for reading config from a file (diff) | |
| download | synapse-3eb45eba0e387dacb67158efe323f19731799c79.tar.xz | |
Merge branch 'develop' into server2server_tls
Diffstat (limited to '')
| -rw-r--r-- | webclient/home/home-controller.js | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/webclient/home/home-controller.js b/webclient/home/home-controller.js index 008dff7422..547a5c5603 100644 --- a/webclient/home/home-controller.js +++ b/webclient/home/home-controller.js @@ -42,7 +42,13 @@ angular.module('HomeController', ['matrixService', 'eventHandlerService', 'Recen matrixService.publicRooms().then( function(response) { - $scope.public_rooms = matrixService.assignRoomAliases(response.data.chunk); + $scope.public_rooms = response.data.chunk; + for (var i = 0; i < $scope.public_rooms.length; i++) { + var room = $scope.public_rooms[i]; + + // Add room_alias & room_display_name members + angular.extend(room, matrixService.getRoomAliasAndDisplayName(room)); + } } ); }; |