diff options
| author | Erik Johnston <erik@matrix.org> | 2014-08-21 17:55:41 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-08-21 17:55:41 +0100 |
| commit | 2e1ab9db08e3fe41822a65fdf38feafbd22173b6 (patch) | |
| tree | 07d304a6cfd661c9c449e69da97101e47e3a8e55 /webclient/rooms/rooms-controller.js | |
| parent | Add ts field to all events. (diff) | |
| download | synapse-2e1ab9db08e3fe41822a65fdf38feafbd22173b6.tar.xz | |
Only start event streaming after having set up the controllers.
Diffstat (limited to 'webclient/rooms/rooms-controller.js')
| -rw-r--r-- | webclient/rooms/rooms-controller.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/webclient/rooms/rooms-controller.js b/webclient/rooms/rooms-controller.js index 6bbb2b2ba1..c2d7bcb6f3 100644 --- a/webclient/rooms/rooms-controller.js +++ b/webclient/rooms/rooms-controller.js @@ -17,8 +17,8 @@ limitations under the License. 'use strict'; angular.module('RoomsController', ['matrixService', 'mFileInput', 'mFileUpload', 'eventHandlerService']) -.controller('RoomsController', ['$scope', '$location', 'matrixService', 'mFileUpload', 'eventHandlerService', - function($scope, $location, matrixService, mFileUpload, eventHandlerService) { +.controller('RoomsController', ['$scope', '$location', 'matrixService', 'mFileUpload', 'eventHandlerService', 'eventStreamService', + function($scope, $location, matrixService, mFileUpload, eventHandlerService, eventStreamService) { $scope.rooms = {}; $scope.public_rooms = []; @@ -113,6 +113,8 @@ angular.module('RoomsController', ['matrixService', 'mFileInput', 'mFileUpload', $scope.public_rooms = assignRoomAliases(response.data.chunk); } ); + + eventStreamService.resume(); }; $scope.createNewRoom = function(room_id, isPrivate) { |