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 10:19:37 +0200
committerEmmanuel ROHEE <erohee@amdocs.com>2014-09-02 10:19:37 +0200
commit027857b2616869838f35f11af15f886057f3af54 (patch)
tree476618a9b6535033633d3f51d77d7a3a800b05f6 /webclient/room/room-controller.js
parentgiven everything's apparently gone https:// by default for c-s, change this h... (diff)
parentBF: Take into account MEMBER_EVENT and PRESENCE_EVENT events only after the i... (diff)
downloadsynapse-027857b2616869838f35f11af15f886057f3af54.tar.xz
Merge branch 'withoutYAML' into develop
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() {