浏览代码

Adds raise hand button to the side toolbar

j8
yanas 8 年前
父节点
当前提交
cf49c8c6ff
共有 3 个文件被更改,包括 9 次插入3 次删除
  1. 2
    0
      index.html
  2. 1
    1
      interface_config.js
  3. 6
    2
      modules/UI/toolbars/Toolbar.js

+ 2
- 0
index.html 查看文件

123
             <a class="button icon-contactList" id="toolbar_contact_list" data-container="body" data-toggle="popover" data-placement="right" shortcut="contactlistpopover"  data-i18n="[content]bottomtoolbar.contactlist" content="Open / close contact list">
123
             <a class="button icon-contactList" id="toolbar_contact_list" data-container="body" data-toggle="popover" data-placement="right" shortcut="contactlistpopover"  data-i18n="[content]bottomtoolbar.contactlist" content="Open / close contact list">
124
                 <span id="numberOfParticipants"></span>
124
                 <span id="numberOfParticipants"></span>
125
             </a>
125
             </a>
126
+            <a class="button icon-link" id="toolbar_button_link" data-container="body" data-toggle="popover" data-placement="right" data-i18n="[content]toolbar.invite" content="Invite others"></a>
126
             <a class="button icon-chat" id="toolbar_button_chat" data-container="body" data-toggle="popover" shortcut="toggleChatPopover" data-placement="right" data-i18n="[content]toolbar.chat" content="Open / close chat">
127
             <a class="button icon-chat" id="toolbar_button_chat" data-container="body" data-toggle="popover" shortcut="toggleChatPopover" data-placement="right" data-i18n="[content]toolbar.chat" content="Open / close chat">
127
                 <span id="unreadMessages"></span>
128
                 <span id="unreadMessages"></span>
128
             </a>
129
             </a>
137
             <a class="button icon-telephone" id="toolbar_button_sip" data-container="body" data-toggle="popover" data-placement="right" content="Call SIP number" data-i18n="[content]toolbar.sip" style="display: none"></a>
138
             <a class="button icon-telephone" id="toolbar_button_sip" data-container="body" data-toggle="popover" data-placement="right" content="Call SIP number" data-i18n="[content]toolbar.sip" style="display: none"></a>
138
             <a class="button icon-dialpad" id="toolbar_button_dialpad" data-container="body" data-toggle="popover" data-placement="right" content="Open dialpad" data-i18n="[content]toolbar.dialpad" style="display: none"></a>
139
             <a class="button icon-dialpad" id="toolbar_button_dialpad" data-container="body" data-toggle="popover" data-placement="right" content="Open dialpad" data-i18n="[content]toolbar.dialpad" style="display: none"></a>
139
             <a class="button icon-settings" id="toolbar_button_settings" data-container="body" data-toggle="popover" data-placement="right" content="Settings" data-i18n="[content]toolbar.Settings"></a>
140
             <a class="button icon-settings" id="toolbar_button_settings" data-container="body" data-toggle="popover" data-placement="right" content="Settings" data-i18n="[content]toolbar.Settings"></a>
141
+            <a class="button icon-raised-hand" id="toolbar_button_raisehand" data-container="body" data-toggle="popover" data-placement="right" data-i18n="[content]toolbar.raiseHand" content="Raise Hand" shortcut="raiseHandPopover"></a>
140
             <a class="button icon-full-screen" id="toolbar_button_fullScreen" data-container="body" data-toggle="popover" data-placement="right" shortcut="toggleFullscreenPopover" data-i18n="[content]toolbar.fullscreen" content="Enter / Exit Full Screen"></a>
142
             <a class="button icon-full-screen" id="toolbar_button_fullScreen" data-container="body" data-toggle="popover" data-placement="right" shortcut="toggleFullscreenPopover" data-i18n="[content]toolbar.fullscreen" content="Enter / Exit Full Screen"></a>
141
             <a class="button icon-toggle-filmstrip" id="toolbar_film_strip" data-container="body" data-toggle="popover" shortcut="filmstripPopover" data-placement="right" data-i18n="[content]toolbar.filmstrip" content="Show / hide videos"></a>
143
             <a class="button icon-toggle-filmstrip" id="toolbar_film_strip" data-container="body" data-toggle="popover" shortcut="filmstripPopover" data-placement="right" data-i18n="[content]toolbar.filmstrip" content="Show / hide videos"></a>
142
             <a class="button icon-feedback" id="feedbackButton" data-container="body" data-toggle="popover" data-placement="right" data-i18n="[content]feedback"></a>
144
             <a class="button icon-feedback" id="feedbackButton" data-container="body" data-toggle="popover" data-placement="right" data-i18n="[content]feedback"></a>

+ 1
- 1
interface_config.js 查看文件

20
     // the toolbar buttons line is intentionally left in one line, to be able
20
     // the toolbar buttons line is intentionally left in one line, to be able
21
     // to easily override values or remove them using regex
21
     // to easily override values or remove them using regex
22
     MAIN_TOOLBAR_BUTTONS: ['microphone', 'camera', 'desktop', 'invite', 'hangup'], // jshint ignore:line
22
     MAIN_TOOLBAR_BUTTONS: ['microphone', 'camera', 'desktop', 'invite', 'hangup'], // jshint ignore:line
23
-    TOOLBAR_BUTTONS: ['profile', 'authentication', 'microphone', 'camera', 'desktop', 'recording', 'security', 'invite', 'chat', 'etherpad', 'sharedvideo', 'fullscreen', 'sip', 'dialpad', 'settings', 'hangup', 'filmstrip', 'contacts'], // jshint ignore:line
23
+    TOOLBAR_BUTTONS: ['profile', 'authentication', 'microphone', 'camera', 'desktop', 'recording', 'security', 'raisehand', 'chat', 'etherpad', 'sharedvideo', 'fullscreen', 'sip', 'dialpad', 'settings', 'hangup', 'filmstrip', 'contacts'], // jshint ignore:line
24
     SETTINGS_SECTIONS: ['language', 'devices', 'moderator'],
24
     SETTINGS_SECTIONS: ['language', 'devices', 'moderator'],
25
     // Determines how the video would fit the screen. 'both' would fit the whole
25
     // Determines how the video would fit the screen. 'both' would fit the whole
26
     // screen, 'height' would fit the original video height to the height of the
26
     // screen, 'height' would fit the original video height to the height of the

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

341
         this.toolbarSelector = $("#mainToolbarContainer");
341
         this.toolbarSelector = $("#mainToolbarContainer");
342
         this.extendedToolbarSelector = $("#extendedToolbar");
342
         this.extendedToolbarSelector = $("#extendedToolbar");
343
 
343
 
344
-        this._initMainToolbarButtons();
345
-
344
+        // First hide all disabled buttons in the extended toolbar.
345
+        // TODO: Make the extended toolbar dynamically created.
346
         UIUtil.hideDisabledButtons(defaultToolbarButtons);
346
         UIUtil.hideDisabledButtons(defaultToolbarButtons);
347
 
347
 
348
+        // Initialise the main toolbar. The main toolbar will only take into
349
+        // account it's own configuration from interface_config.
350
+        this._initMainToolbarButtons();
351
+
348
         Object.keys(defaultToolbarButtons).forEach(
352
         Object.keys(defaultToolbarButtons).forEach(
349
             id => {
353
             id => {
350
                 if (UIUtil.isButtonEnabled(id)) {
354
                 if (UIUtil.isButtonEnabled(id)) {

正在加载...
取消
保存