]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-8336 [verto_communicator] #resolve Using conferenceMemberID when checking if the...
authorItalo Rossi <italorossib@gmail.com>
Wed, 21 Oct 2015 20:31:34 +0000 (17:31 -0300)
committerItalo Rossi <italorossib@gmail.com>
Wed, 21 Oct 2015 20:31:57 +0000 (17:31 -0300)
html5/verto/verto_communicator/src/vertoControllers/controllers/ChatController.js
html5/verto/verto_communicator/src/vertoService/services/vertoService.js

index 472a4a57716d1058ee6b8ff7570310a5cfa1423d..256d1bb3e5b14cb14466bfd3e4eca7ff3f97fa4c 100644 (file)
             // console.log('Updating', memberIdx, ' <', $scope.members[memberIdx],
               // '> with <', member, '>');
             // Checking if it's me
-              if (member.name == verto.data.name && member.email == verto.data.email) {
-                verto.data.mutedMic = member.status.audio.muted;
-                verto.data.mutedVideo = member.status.video.muted;
-              }
+            if (parseInt(member.id) == parseInt(verto.data.conferenceMemberID)) {
+              verto.data.mutedMic = member.status.audio.muted;
+              verto.data.mutedVideo = member.status.video.muted;
+            }
             angular.extend($scope.members[memberIdx], member);
           });
         }
index 652d5aa0da7422d7e0eabc03f1717b4e1e056196..26c13c6fc1a72fb97b08aaa09736afeefb7f3cf4 100644 (file)
@@ -346,7 +346,7 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora
           $rootScope.$emit('call.conference', 'conference');
           data.chattingWith = pvtData.chatID;
           data.confRole = pvtData.role;
-
+          data.conferenceMemberID = pvtData.conferenceMemberID;
           var conf = new $.verto.conf(v, {
             dialog: dialog,
             hasVid: storage.data.useVideo,