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

Adds a possibility to add raise hand as a button

This commit is contained in:
yanas 2016-09-13 20:50:30 -05:00
parent 929639b06b
commit 99bf4bc44d
3 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lang/main.json
View File

@ -94,7 +94,8 @@
"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",
"filmstrip": "Show / hide videos" "filmstrip": "Show / hide videos",
"raiseHand": "Raise hand to speak"
}, },
"bottomtoolbar": { "bottomtoolbar": {
"chat": "Open / close chat", "chat": "Open / close chat",

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

@ -168,8 +168,13 @@ const buttonHandlers = {
}, },
"toolbar_film_strip": function () { "toolbar_film_strip": function () {
JitsiMeetJS.analytics.sendEvent( JitsiMeetJS.analytics.sendEvent(
'bottomtoolbar.filmstrip.toggled'); 'toolbar.filmstrip.toggled');
emitter.emit(UIEvents.TOGGLE_FILM_STRIP); emitter.emit(UIEvents.TOGGLE_FILM_STRIP);
},
"toolbar_button_raisehand": function () {
JitsiMeetJS.analytics.sendEvent(
'toolbar.raiseHand.clicked');
APP.conference.maybeToggleRaisedHand();
} }
}; };
@ -288,6 +293,19 @@ const defaultToolbarButtons = {
APP.UI.toggleFilmStrip(); APP.UI.toggleFilmStrip();
}, },
shortcutDescription: "keyboardShortcuts.toggleFilmstrip" shortcutDescription: "keyboardShortcuts.toggleFilmstrip"
},
'raisehand': {
id: "toolbar_button_raisehand",
className: "button icon-raised-hand",
shortcut: "R",
shortcutAttr: "raiseHandPopover",
shortcutFunc: function() {
JitsiMeetJS.analytics.sendEvent("shortcut.raisehand.clicked");
APP.conference.maybeToggleRaisedHand();
},
shortcutDescription: "keyboardShortcuts.raiseHand",
content: "Raise Hand",
i18n: "[content]toolbar.raiseHand"
} }
}; };
@ -679,16 +697,9 @@ const Toolbar = {
} }
); );
}, },
/** /**
* TODO: Fix mic popups * Initialise main toolbar buttons.
* <a class="button icon-microphone" id="toolbar_button_mute" data-container="body" data-toggle="popover" data-placement="bottom" shortcut="mutePopover" data-i18n="[content]toolbar.mute" content="Mute / Unmute">
* <ul id="micMutedPopup" class="loginmenu">
* <li data-i18n="[html]toolbar.micMutedPopup"></li>
* </ul>
* <ul id="unableToUnmutePopup" class="loginmenu">
* <li data-i18n="[html]toolbar.unableToUnmutePopup"></li>
* </ul>
* </a>
*/ */
_initMainToolbarButtons() { _initMainToolbarButtons() {
interfaceConfig.MAIN_TOOLBAR_BUTTONS.forEach((value, index) => { interfaceConfig.MAIN_TOOLBAR_BUTTONS.forEach((value, index) => {

5
modules/keyboardshortcut/keyboardshortcut.js
View File

@ -17,11 +17,6 @@ function initGlobalShortcuts() {
APP.UI.toggleKeyboardShortcutsPanel(); APP.UI.toggleKeyboardShortcutsPanel();
}, "keyboardShortcuts.toggleShortcuts"); }, "keyboardShortcuts.toggleShortcuts");
KeyboardShortcut.registerShortcut("R", null, function() {
JitsiMeetJS.analytics.sendEvent("shortcut.raisedhand.toggled");
APP.conference.maybeToggleRaisedHand();
}, "keyboardShortcuts.raiseHand");
KeyboardShortcut.registerShortcut("T", null, function() { KeyboardShortcut.registerShortcut("T", null, function() {
JitsiMeetJS.analytics.sendEvent("shortcut.talk.clicked"); JitsiMeetJS.analytics.sendEvent("shortcut.talk.clicked");
APP.conference.muteAudio(true); APP.conference.muteAudio(true);