summary refs log tree commit diff
path: root/webclient/home
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2014-08-26 10:24:47 +0100
committerKegan Dougal <kegan@matrix.org>2014-08-26 10:24:47 +0100
commit5796232cb19927612957db3fcf4b77cd383187a6 (patch)
tree18a3724608377c91d64eb2daab49d2d91a8cf4fe /webclient/home
parentMerge branch 'develop' of github.com:matrix-org/synapse into client_server_ur... (diff)
downloadsynapse-5796232cb19927612957db3fcf4b77cd383187a6.tar.xz
Adjusted webclient to use new state paths. Updated membership msg template to actually show the person invited. Factored out common membership functions in matrix service.
Diffstat (limited to 'webclient/home')
-rw-r--r--webclient/home/home-controller.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/webclient/home/home-controller.js b/webclient/home/home-controller.js

index 35d0ef1654..a5576759fa 100644 --- a/webclient/home/home-controller.js +++ b/webclient/home/home-controller.js
@@ -41,7 +41,7 @@ angular.module('HomeController', ['matrixService', 'mFileInput', 'mFileUpload', $scope.$on(eventHandlerService.MEMBER_EVENT, function(ngEvent, event, isLive) { var config = matrixService.config(); - if (event.target_user_id === config.user_id && event.content.membership === "invite") { + if (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;