summary refs log tree commit diff
path: root/webclient/components
diff options
context:
space:
mode:
authorEmmanuel ROHEE <erohee@amdocs.com>2014-09-10 14:53:03 +0200
committerEmmanuel ROHEE <erohee@amdocs.com>2014-09-10 14:53:03 +0200
commitda3f842b8cea7d259d4d2d980020625b9703b1ee (patch)
treeedbac2579bdfe179e0c32cce585ef4922a1dff51 /webclient/components
parentdedup events: state events conflict with messages events. Do not consider the... (diff)
downloadsynapse-da3f842b8cea7d259d4d2d980020625b9703b1ee.tar.xz
Removed wrong comments about recents-controller.js: it uses $rootScope.rooms not $rootScope.events.rooms managed by event-handler-service.js and used by other controllers
Diffstat (limited to 'webclient/components')
-rw-r--r--webclient/components/matrix/event-stream-service.js5
1 files changed, 2 insertions, 3 deletions
diff --git a/webclient/components/matrix/event-stream-service.js b/webclient/components/matrix/event-stream-service.js
index 249af193df..03b805213d 100644
--- a/webclient/components/matrix/event-stream-service.js
+++ b/webclient/components/matrix/event-stream-service.js
@@ -104,9 +104,7 @@ angular.module('eventStreamService', [])
         settings.isActive = true;
         var deferred = $q.defer();
 
-        // FIXME: We are discarding all the messages.
-        // XXX FIXME TODO : The discard works because we are doing this all over
-        // again on EVERY INSTANTIATION of the recents controller.
+        // Initial sync: get all information and the last message of all rooms of the user
         matrixService.initialSync(1, false).then(
             function(response) {
                 var rooms = response.data.rooms;
@@ -128,6 +126,7 @@ angular.module('eventStreamService', [])
                 // Initial sync is done
                 eventHandlerService.handleInitialSyncDone(response);
 
+                // Start event streaming from that point
                 settings.from = response.data.end;
                 doEventStream(deferred);        
             },