haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handles talk while muted event.

This commit is contained in:
damencho 2016-09-08 20:19:18 -05:00
parent 29f0c0b311
commit e7e7c7d5a0
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
conference.js
View File

@ -17,6 +17,7 @@ import mediaDeviceHelper from './modules/devices/mediaDeviceHelper';
import {reportError} from './modules/util/helpers'; import {reportError} from './modules/util/helpers';
import UIErrors from './modules/UI/UIErrors'; import UIErrors from './modules/UI/UIErrors';
import UIUtil from './modules/UI/util/UIUtil';
const ConnectionEvents = JitsiMeetJS.events.connection; const ConnectionEvents = JitsiMeetJS.events.connection;
const ConnectionErrors = JitsiMeetJS.errors.connection; const ConnectionErrors = JitsiMeetJS.errors.connection;
@ -1097,6 +1098,11 @@ export default {
APP.UI.setAudioLevel(id, lvl); APP.UI.setAudioLevel(id, lvl);
}); });
room.on(ConferenceEvents.TALK_WHILE_MUTED, () => {
APP.UI.showToolbar();
UIUtil.animateShowElement($("#talkWhileMutedPopup"), true, 5000);
});
room.on(ConferenceEvents.IN_LAST_N_CHANGED, (inLastN) => { room.on(ConferenceEvents.IN_LAST_N_CHANGED, (inLastN) => {
//FIXME //FIXME
if (config.muteLocalVideoIfNotInLastN) { if (config.muteLocalVideoIfNotInLastN) {

1
lang/main.json
View File

@ -91,6 +91,7 @@
"dialpad": "Show dialpad", "dialpad": "Show dialpad",
"sharedVideoMutedPopup": "Your shared video has been muted so<br/>that you can talk to the other participants.", "sharedVideoMutedPopup": "Your shared video has been muted so<br/>that you can talk to the other participants.",
"micMutedPopup": "Your microphone has been muted so that you<br/>would fully enjoy your shared video.", "micMutedPopup": "Your microphone has been muted so that you<br/>would fully enjoy your shared video.",
"talkWhileMutedPopup": "Your microphone is muted <br/>while you are trying to talk.",
"unableToUnmutePopup": "You cannot un-mute while the shared video is on.", "unableToUnmutePopup": "You cannot un-mute while the shared video is on.",
"cameraDisabled": "Camera is not available", "cameraDisabled": "Camera is not available",
"micDisabled": "Microphone is not available", "micDisabled": "Microphone is not available",