diff options
| author | Erik Johnston <erik@matrix.org> | 2014-08-27 17:05:48 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-08-27 17:05:48 +0100 |
| commit | 7c89d5e97ad5f7e8c67622243cc97392c4ab743d (patch) | |
| tree | 7769fc5fa3e13b6bf1af556ba02e50d94bb51d46 /webclient/recents/recents-controller.js | |
| parent | Comments! (diff) | |
| parent | improve iOS layout a bit (diff) | |
| download | synapse-7c89d5e97ad5f7e8c67622243cc97392c4ab743d.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'webclient/recents/recents-controller.js')
| -rw-r--r-- | webclient/recents/recents-controller.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/webclient/recents/recents-controller.js b/webclient/recents/recents-controller.js index a9805fc38a..8f8b08d5bd 100644 --- a/webclient/recents/recents-controller.js +++ b/webclient/recents/recents-controller.js @@ -20,7 +20,11 @@ angular.module('RecentsController', ['matrixService', 'eventHandlerService']) .controller('RecentsController', ['$scope', 'matrixService', 'eventHandlerService', 'eventStreamService', function($scope, matrixService, eventHandlerService, eventStreamService) { $scope.rooms = {}; - + + // $scope of the parent where the recents component is included can override this value + // in order to highlight a specific room in the list + $scope.recentsSelectedRoomID; + $scope.$on(eventHandlerService.MEMBER_EVENT, function(ngEvent, event, isLive) { var config = matrixService.config(); if (event.state_key === config.user_id && event.content.membership === "invite") { |