diff options
| author | Erik Johnston <erik@matrix.org> | 2014-08-15 16:21:13 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-08-15 16:21:13 +0100 |
| commit | a17b371384ef5e09f20415258bdcb7ddd53ce20c (patch) | |
| tree | 5a355c437c0f2bafdace0b80d3d9f1984409b6a0 /webclient/app.js | |
| parent | PEP8 cleanups (diff) | |
| parent | Fix imsync's SELECT query to only find the rooms I'm actually joined in, not ... (diff) | |
| download | synapse-a17b371384ef5e09f20415258bdcb7ddd53ce20c.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor
Conflicts: synapse/storage/roommember.py
Diffstat (limited to 'webclient/app.js')
| -rw-r--r-- | webclient/app.js | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/webclient/app.js b/webclient/app.js index 0b613fa206..6e0351067f 100644 --- a/webclient/app.js +++ b/webclient/app.js @@ -20,7 +20,9 @@ var matrixWebClient = angular.module('matrixWebClient', [ 'LoginController', 'RoomController', 'RoomsController', - 'matrixService' + 'matrixService', + 'eventStreamService', + 'eventHandlerService' ]); matrixWebClient.config(['$routeProvider', '$provide', '$httpProvider', @@ -59,12 +61,16 @@ matrixWebClient.config(['$routeProvider', '$provide', '$httpProvider', $httpProvider.interceptors.push('AccessTokenInterceptor'); }]); -matrixWebClient.run(['$location', 'matrixService' , function($location, matrixService) { +matrixWebClient.run(['$location', 'matrixService', 'eventStreamService', function($location, matrixService, eventStreamService) { // If we have no persistent login information, go to the login page var config = matrixService.config(); if (!config || !config.access_token) { + eventStreamService.stop(); $location.path("login"); } + else { + eventStreamService.resume(); + } }]); matrixWebClient |