diff options
| author | Erik Johnston <erik@matrix.org> | 2014-09-05 20:39:57 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-09-05 20:39:57 +0100 |
| commit | 1c7bb34ffd564dca9f0b761a75f7cda348fdefeb (patch) | |
| tree | 1e30e9277e212b288a5a1f30dcb953e7d947ba40 /webclient/recents/recents-controller.js | |
| parent | Empty string is not a valid JSON object, so don't return them in HTTP responses. (diff) | |
| parent | BF: tab completion did not work with commands. $scope.input contained only th... (diff) | |
| download | synapse-1c7bb34ffd564dca9f0b761a75f7cda348fdefeb.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 | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/webclient/recents/recents-controller.js b/webclient/recents/recents-controller.js index 3209f2cbdf..0f27f7a660 100644 --- a/webclient/recents/recents-controller.js +++ b/webclient/recents/recents-controller.js @@ -16,7 +16,7 @@ 'use strict'; -angular.module('RecentsController', ['matrixService', 'eventHandlerService']) +angular.module('RecentsController', ['matrixService', 'matrixFilter', 'eventHandlerService']) .controller('RecentsController', ['$scope', 'matrixService', 'eventHandlerService', function($scope, matrixService, eventHandlerService) { $scope.rooms = {}; @@ -28,13 +28,8 @@ angular.module('RecentsController', ['matrixService', 'eventHandlerService']) var listenToEventStream = function() { // Refresh the list on matrix invitation and message event $scope.$on(eventHandlerService.MEMBER_EVENT, function(ngEvent, event, isLive) { - var config = matrixService.config(); - if (isLive && event.state_key === config.user_id && event.content.membership === "invite") { - console.log("Invited to room " + event.room_id); - // FIXME push membership to top level key to match /im/sync - event.membership = event.content.membership; - - $scope.rooms[event.room_id] = event; + if (isLive) { + $scope.rooms[event.room_id].lastMsg = event; } }); $scope.$on(eventHandlerService.MSG_EVENT, function(ngEvent, event, isLive) { |