kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #439 in FS/freeswitch from ~JMESQUITA/freeswitch:bugfix/FS-7957-when-entering-muted-in-a-conference to master 

* commit 'cb52b6e2b4b5d855d2b0b8fcb83b3961ffe784f9':
  FS-7957: [verto_communicator] Make console less chatty by commenting liveArray updates and get initial state of the conference on liveArray boot event.
This commit is contained in:
Brian West 2015-08-26 20:22:23 -05:00
parent 3ba29f7f0e cb52b6e2b4
commit 8a5f2521eb
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
html5/verto/verto_communicator/src/vertoControllers/controllers/ChatController.js
View File

@ -82,13 +82,11 @@
} }
$rootScope.$on('members.boot', function(event, members) { $rootScope.$on('members.boot', function(event, members) {
console.log('members.boot', event, members);
$scope.$apply(function() { $scope.$apply(function() {
clearConferenceChat(); clearConferenceChat();
for (var idx in members) { for (var idx in members) {
var member = members[idx]; var member = members[idx];
addMember(member); addMember(member);
console.log($scope.members);
} }
}) })
}); });
@ -116,8 +114,8 @@
console.log('Didn\'t find the member uuid ' + member.uuid); console.log('Didn\'t find the member uuid ' + member.uuid);
} else { } else {
$scope.$apply(function() { $scope.$apply(function() {
console.log('Updating', memberIdx, ' <', $scope.members[memberIdx], // console.log('Updating', memberIdx, ' <', $scope.members[memberIdx],
'> with <', member, '>'); // '> with <', member, '>');
angular.extend($scope.members[memberIdx], member); angular.extend($scope.members[memberIdx], member);
}); });
} }

12
html5/verto/verto_communicator/src/vertoService/services/vertoService.js
View File

@ -398,11 +398,21 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora
}; };
data.liveArray.onChange = function(obj, args) { data.liveArray.onChange = function(obj, args) {
console.log('liveArray.onChange', obj, args); // console.log('liveArray.onChange', obj, args);
switch (args.action) { switch (args.action) {
case 'bootObj': case 'bootObj':
$rootScope.$emit('members.boot', args.data); $rootScope.$emit('members.boot', args.data);
args.data.forEach(function(member){
var callId = member[0];
var status = angular.fromJson(member[1][4]);
if (callId === data.call.callID) {
$rootScope.$apply(function(){
data.mutedMic = status.audio.muted;
data.mutedVideo = status.video.muted;
});
}
});
break; break;
case 'add': case 'add':
var member = [args.key, args.data]; var member = [args.key, args.data];