summary refs log tree commit diff
path: root/webclient/app-controller.js
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2014-08-15 14:06:48 +0100
committerKegan Dougal <kegan@matrix.org>2014-08-15 14:06:56 +0100
commit5ac87292c4810d816f16b1d2dd6a0dac643812e5 (patch)
treec858636626c9cd17407a7d4e103a8c487cd6f9c6 /webclient/app-controller.js
parentEvent streaming now happens on an app level, rather than a per-room level. Ma... (diff)
downloadsynapse-5ac87292c4810d816f16b1d2dd6a0dac643812e5.tar.xz
Remove old polling stuff from RoomController. Added service comments. Do not start the event stream on startup unless you have credentials.
Diffstat (limited to 'webclient/app-controller.js')
-rw-r--r--webclient/app-controller.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/webclient/app-controller.js b/webclient/app-controller.js
index 7f5f93ef72..7fa87e30c1 100644
--- a/webclient/app-controller.js
+++ b/webclient/app-controller.js
@@ -46,7 +46,9 @@ angular.module('MatrixWebClientController', ['matrixService'])
         }
     };
 
-    eventStreamService.resume();
+    if (matrixService.config()) {
+        eventStreamService.resume();
+    }
     
     // Logs the user out 
     $scope.logout = function() {