mirror of
https://github.com/element-hq/synapse
synced 2024-08-19 22:00:22 +00:00
Merge branch 'withoutYAML' into develop
This commit is contained in:
commit
027857b261
1 changed files with 6 additions and 2 deletions
|
@ -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() {
|
||||
|
|
Loading…
Reference in a new issue