summary refs log tree commit diff
path: root/webclient/room/room-controller.js
diff options
context:
space:
mode:
authorEmmanuel ROHEE <erohee@amdocs.com>2014-09-02 09:39:43 +0200
committerEmmanuel ROHEE <erohee@amdocs.com>2014-09-02 09:39:43 +0200
commit07d609cbc2aefe3495b05d939e4a2f065818dd08 (patch)
tree6f07a161c746c94f8a703e5485edf59adb77f168 /webclient/room/room-controller.js
parentFollow API renaming. state -> presence. mtime_ago -> last_active_ago (diff)
downloadsynapse-07d609cbc2aefe3495b05d939e4a2f065818dd08.tar.xz
BF: Take into account MEMBER_EVENT and PRESENCE_EVENT events only after the initialSync is done
Diffstat (limited to 'webclient/room/room-controller.js')
-rw-r--r--webclient/room/room-controller.js8
1 files changed, 6 insertions, 2 deletions
diff --git a/webclient/room/room-controller.js b/webclient/room/room-controller.js
index 9861b25617..472a4d2fae 100644
--- a/webclient/room/room-controller.js
+++ b/webclient/room/room-controller.js
@@ -75,11 +75,15 @@ angular.module('RoomController', ['ngSanitize', 'mFileInput'])
     });
     
     $scope.$on(eventHandlerService.MEMBER_EVENT, function(ngEvent, event, isLive) {
-        updateMemberList(event);
+        if (isLive) {
+            updateMemberList(event);
+        }
     });
     
     $scope.$on(eventHandlerService.PRESENCE_EVENT, function(ngEvent, event, isLive) {
-        updatePresence(event);
+        if (isLive) {
+            updatePresence(event);
+        }
     });
 
     $scope.memberCount = function() {