diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-08-27 16:54:12 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-08-27 16:54:12 +0100 |
| commit | 1d95e78759cc1307d15d6cc6388f52063e833355 (patch) | |
| tree | 0307617989016019bfd1d41a15b22499d02091ef /webclient/room | |
| parent | add _get_room_member, fix datastore methods (diff) | |
| parent | Added RestServlet for /rooms/$roomid/initialSync (diff) | |
| download | synapse-1d95e78759cc1307d15d6cc6388f52063e833355.tar.xz | |
Merge branch 'develop' into storage_transactions
Diffstat (limited to 'webclient/room')
| -rw-r--r-- | webclient/room/room-controller.js | 3 | ||||
| -rw-r--r-- | webclient/room/room.html | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/webclient/room/room-controller.js b/webclient/room/room-controller.js index f49deaa489..641ccddce7 100644 --- a/webclient/room/room-controller.js +++ b/webclient/room/room-controller.js @@ -327,6 +327,9 @@ angular.module('RoomController', ['ngSanitize', 'mUtilities']) var onInit2 = function() { eventHandlerService.reInitRoom($scope.room_id); + // Make recents highlight the current room + $scope.recentsSelectedRoomID = $scope.room_id; + // Join the room matrixService.join($scope.room_id).then( function() { diff --git a/webclient/room/room.html b/webclient/room/room.html index c167819f15..236ca0a89b 100644 --- a/webclient/room/room.html +++ b/webclient/room/room.html @@ -7,7 +7,11 @@ <div id="roomName"> {{ room_alias || room_id }} </div> - + + <div id="roomRecentsTableWrapper"> + <div ng-include="'recents/recents.html'"></div> + </div> + <div id="usersTableWrapper"> <table id="usersTable"> <tr ng-repeat="member in members | orderMembersList"> |