mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-12-18 17:10:43 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'withoutYAML' into develop

Browse source
This commit is contained in:
Emmanuel ROHEE 2014-09-02 10:19:37 +02:00
commit 027857b261
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
webclient/room/room-controller.js
View file

@ -75,11 +75,15 @@ angular.module('RoomController', ['ngSanitize', 'mFileInput'])
}); });
$scope.$on(eventHandlerService.MEMBER_EVENT, function(ngEvent, event, isLive) { $scope.$on(eventHandlerService.MEMBER_EVENT, function(ngEvent, event, isLive) {
if (isLive) {
updateMemberList(event); updateMemberList(event);
}
}); });
$scope.$on(eventHandlerService.PRESENCE_EVENT, function(ngEvent, event, isLive) { $scope.$on(eventHandlerService.PRESENCE_EVENT, function(ngEvent, event, isLive) {
if (isLive) {
updatePresence(event); updatePresence(event);
}
}); });
$scope.memberCount = function() { $scope.memberCount = function() {