diff options
| author | Kegan Dougal <kegan@matrix.org> | 2014-08-15 13:43:07 +0100 |
|---|---|---|
| committer | Kegan Dougal <kegan@matrix.org> | 2014-08-15 14:06:56 +0100 |
| commit | 7ddb7a5cbbe9e4576742dc060ba35ca863b8d8b0 (patch) | |
| tree | 395bea9a7d9f95fab285ed9a68d8354dec016ff4 /webclient/room | |
| parent | Store messages in $rootScope so they can be accessed from multiple controller... (diff) | |
| download | synapse-7ddb7a5cbbe9e4576742dc060ba35ca863b8d8b0.tar.xz | |
Event streaming now happens on an app level, rather than a per-room level. Make eventStreamService manage it's own repolling provided no one calls stop() on it. Couple the stream with eventHandlerService so any controller can just blithely call eventStreamService.resume() and expect to 'get stuff' without having to handle promises (though resume() still returns a promise for that request and proxies it through $q). Kill and reset the stream if you logout.
Diffstat (limited to 'webclient/room')
| -rw-r--r-- | webclient/room/room-controller.js | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/webclient/room/room-controller.js b/webclient/room/room-controller.js index 4c5415eace..49c73ff4bb 100644 --- a/webclient/room/room-controller.js +++ b/webclient/room/room-controller.js @@ -119,7 +119,6 @@ angular.module('RoomController', []) function(response) { var member = $scope.members[chunk.target_user_id]; if (member !== undefined) { - console.log("Updated displayname "+chunk.target_user_id+" to " + response.data.displayname); member.displayname = response.data.displayname; } } @@ -128,7 +127,6 @@ angular.module('RoomController', []) function(response) { var member = $scope.members[chunk.target_user_id]; if (member !== undefined) { - console.log("Updated image for "+chunk.target_user_id+" to " + response.data.avatar_url); member.avatar_url = response.data.avatar_url; } } @@ -204,8 +202,6 @@ angular.module('RoomController', []) matrixService.join($scope.room_id).then( function() { console.log("Joined room "+$scope.room_id); - // Now start reading from the stream - $timeout(shortPoll, 0); // Get the current member list matrixService.getMemberList($scope.room_id).then( |