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

Merge pull request #537 in FS/freeswitch from ~STEFAN_YOHANSSON/freeswitch:bugfix/FS-8289-make-the-mute-unmute-audio-video to master 

* commit '967c20d85e7d916ac392d88e1c2a089212e51ecc':
  FS-8289 #resolve [verto_communicator] make mute/unmute audio/video clickable
This commit is contained in:
Ken Rice 2015-10-02 17:53:45 -05:00
parent 68a0e507e2 967c20d85e
commit e8b348176b
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
html5/verto/verto_communicator/src/css/verto.css
View File

@ -16,6 +16,10 @@ body {
display: inline-block;
}
.clickable {
cursor: pointer;
}
.inline-block {
display: inline-block;
}

4
html5/verto/verto_communicator/src/partials/chat.html
View File

@ -103,8 +103,8 @@
</div>
<span class="chat-members-status pull-right">
<i class="in-use" ng-class="{'mdi-av-mic': !member.status.audio.muted, 'mdi-av-mic-off': member.status.audio.muted, 'mic_talking': member.status.audio.talking}"></i>
<i ng-class="{'mdi-av-videocam': !member.status.video.muted, 'mdi-av-videocam-off': member.status.video.muted, 'in-use': (member.status.video && !member.status.video.muted), 'disabled': !member.status.video}"></i>
<i ng-click="confMuteMic(member.id)" class="in-use" ng-class="{'clickable': verto.data.confRole == 'moderator', 'mdi-av-mic': !member.status.audio.muted, 'mdi-av-mic-off': member.status.audio.muted, 'mic_talking': member.status.audio.talking}"></i>
<i ng-click="confMuteVideo(member.id)" ng-class="{'clickable': verto.data.confRole == 'moderator', 'mdi-av-videocam': !member.status.video.muted, 'mdi-av-videocam-off': member.status.video.muted, 'in-use': (member.status.video && !member.status.video.muted), 'disabled': !member.status.video}"></i>
</span>
</div>
</div>

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

@ -146,13 +146,17 @@
};
$scope.confMuteMic = function(memberID) {
console.log('$scope.confMuteMic');
verto.data.conf.muteMic(memberID);
if(verto.data.confRole == 'moderator') {
console.log('$scope.confMuteMic');
verto.data.conf.muteMic(memberID);
}
};
$scope.confMuteVideo = function(memberID) {
console.log('$scope.confMuteVideo');
verto.data.conf.muteVideo(memberID);
if(verto.data.confRole == 'moderator') {
console.log('$scope.confMuteVideo');
verto.data.conf.muteVideo(memberID);
}
};
$scope.confPresenter = function(memberID) {