Merge pull request #959 from m-voloshin/keyboard-shortcuts-help

Removed duplicates from keyboard shortcuts
This commit is contained in:
yanas 2016-09-29 10:42:27 -05:00 committed by GitHub
commit fe7911b944
2 changed files with 3 additions and 2 deletions

View File

@ -31,6 +31,7 @@
"focusRemote": "Focus on one of the remote videos.",
"toggleChat": "Open or close the chat panel.",
"mute": "Mute or unmute the microphone.",
"fullScreen": "Enter or exit full screen mode.",
"videoMute": "Stop or start the local video."
},
"welcomepage":{

View File

@ -283,13 +283,13 @@ const defaultToolbarButtons = {
id: 'toolbar_button_fullScreen',
tooltipKey: 'toolbar.fullscreen',
className: "button icon-full-screen",
shortcut: 'F',
shortcut: 'S',
shortcutAttr: 'toggleFullscreenPopover',
shortcutFunc: function() {
JitsiMeetJS.analytics.sendEvent('shortcut.fullscreen.toggled');
APP.UI.toggleFullScreen();
},
shortcutDescription: "keyboardShortcuts.toggleChat",
shortcutDescription: "keyboardShortcuts.fullScreen",
content: "Enter / Exit Full Screen",
i18n: "[content]toolbar.fullscreen"
},