浏览代码

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

Removed duplicates from keyboard shortcuts
master
yanas 8 年前
父节点
当前提交
fe7911b944
共有 2 个文件被更改,包括 3 次插入2 次删除
  1. 1
    0
      lang/main.json
  2. 2
    2
      modules/UI/toolbars/Toolbar.js

+ 1
- 0
lang/main.json 查看文件

31
         "focusRemote": "Focus on one of the remote videos.",
31
         "focusRemote": "Focus on one of the remote videos.",
32
         "toggleChat": "Open or close the chat panel.",
32
         "toggleChat": "Open or close the chat panel.",
33
         "mute": "Mute or unmute the microphone.",
33
         "mute": "Mute or unmute the microphone.",
34
+        "fullScreen": "Enter or exit full screen mode.",
34
         "videoMute": "Stop or start the local video."
35
         "videoMute": "Stop or start the local video."
35
     },
36
     },
36
     "welcomepage":{
37
     "welcomepage":{

+ 2
- 2
modules/UI/toolbars/Toolbar.js 查看文件

283
         id: 'toolbar_button_fullScreen',
283
         id: 'toolbar_button_fullScreen',
284
         tooltipKey: 'toolbar.fullscreen',
284
         tooltipKey: 'toolbar.fullscreen',
285
         className: "button icon-full-screen",
285
         className: "button icon-full-screen",
286
-        shortcut: 'F',
286
+        shortcut: 'S',
287
         shortcutAttr: 'toggleFullscreenPopover',
287
         shortcutAttr: 'toggleFullscreenPopover',
288
         shortcutFunc: function() {
288
         shortcutFunc: function() {
289
             JitsiMeetJS.analytics.sendEvent('shortcut.fullscreen.toggled');
289
             JitsiMeetJS.analytics.sendEvent('shortcut.fullscreen.toggled');
290
             APP.UI.toggleFullScreen();
290
             APP.UI.toggleFullScreen();
291
         },
291
         },
292
-        shortcutDescription: "keyboardShortcuts.toggleChat",
292
+        shortcutDescription: "keyboardShortcuts.fullScreen",
293
         content: "Enter / Exit Full Screen",
293
         content: "Enter / Exit Full Screen",
294
         i18n: "[content]toolbar.fullscreen"
294
         i18n: "[content]toolbar.fullscreen"
295
     },
295
     },

正在加载...
取消
保存