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

Merge branch 'master' into webpack

This commit is contained in:
Lyubomir Marinov 2016-09-30 11:16:22 -05:00
parent ecf44498b8 17b57ea852
commit c8f18040f6
6 changed files with 21 additions and 9 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;
@ -1278,6 +1279,11 @@ export default {
APP.UI.setAudioLevel(id, lvl); APP.UI.setAudioLevel(id, lvl);
}); });
room.on(ConferenceEvents.TALK_WHILE_MUTED, () => {
APP.UI.showToolbar(6000);
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

@ -90,6 +90,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": "Trying to speak? You are muted.",
"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",

4
modules/UI/UI.js
View File

@ -884,8 +884,8 @@ UI.clickOnVideo = function (videoNumber) {
}; };
//Used by torture //Used by torture
UI.showToolbar = function () { UI.showToolbar = function (timeout) {
return ToolbarToggler.showToolbar(); return ToolbarToggler.showToolbar(timeout);
}; };
//Used by torture //Used by torture

5
modules/UI/toolbars/Toolbar.js
View File

@ -209,6 +209,11 @@ const defaultToolbarButtons = {
id: "unableToUnmutePopup", id: "unableToUnmutePopup",
className: "loginmenu", className: "loginmenu",
dataAttr: "[html]toolbar.unableToUnmutePopup" dataAttr: "[html]toolbar.unableToUnmutePopup"
},
{
id: "talkWhileMutedPopup",
className: "loginmenu",
dataAttr: "[html]toolbar.talkWhileMutedPopup"
} }
], ],
content: "Mute / Unmute", content: "Mute / Unmute",

6
modules/UI/toolbars/ToolbarToggler.js
View File

@ -89,8 +89,9 @@ const ToolbarToggler = {
/** /**
* Shows the main toolbar. * Shows the main toolbar.
* @param timeout (optional) to specify custom timeout value
*/ */
showToolbar () { showToolbar (timeout) {
if (interfaceConfig.filmStripOnly) { if (interfaceConfig.filmStripOnly) {
return; return;
} }
@ -107,7 +108,8 @@ const ToolbarToggler = {
clearTimeout(toolbarTimeoutObject); clearTimeout(toolbarTimeoutObject);
toolbarTimeoutObject = null; toolbarTimeoutObject = null;
} }
toolbarTimeoutObject = setTimeout(hideToolbar, toolbarTimeout); toolbarTimeoutObject
= setTimeout(hideToolbar, timeout || toolbarTimeout);
toolbarTimeout = interfaceConfig.TOOLBAR_TIMEOUT; toolbarTimeout = interfaceConfig.TOOLBAR_TIMEOUT;
} }

8
modules/UI/util/UIUtil.js
View File

@ -143,11 +143,9 @@ const TOOLTIP_POSITIONS = {
* @param element the element to remove the tooltip from * @param element the element to remove the tooltip from
*/ */
removeTooltip: function (element) { removeTooltip: function (element) {
AJS.$(element).tooltip('destroy'); element.removeAttribute('data-tooltip', '');
element.setAttribute('data-tooltip', ''); element.removeAttribute('data-i18n','');
element.setAttribute('data-i18n',''); element.removeAttribute('content','');
element.setAttribute('content','');
element.setAttribute('shortcut','');
}, },
/** /**