Просмотр исходного кода

Adds raise hand button to the side toolbar

j8
yanas 8 лет назад
Родитель
Сommit
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,6 +123,7 @@
123 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 124
                 <span id="numberOfParticipants"></span>
125 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 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 128
                 <span id="unreadMessages"></span>
128 129
             </a>
@@ -137,6 +138,7 @@
137 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 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 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 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 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 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,7 +20,7 @@ var interfaceConfig = {
20 20
     // the toolbar buttons line is intentionally left in one line, to be able
21 21
     // to easily override values or remove them using regex
22 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 24
     SETTINGS_SECTIONS: ['language', 'devices', 'moderator'],
25 25
     // Determines how the video would fit the screen. 'both' would fit the whole
26 26
     // screen, 'height' would fit the original video height to the height of the

+ 6
- 2
modules/UI/toolbars/Toolbar.js Просмотреть файл

@@ -341,10 +341,14 @@ const Toolbar = {
341 341
         this.toolbarSelector = $("#mainToolbarContainer");
342 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 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 352
         Object.keys(defaultToolbarButtons).forEach(
349 353
             id => {
350 354
                 if (UIUtil.isButtonEnabled(id)) {

Загрузка…
Отмена
Сохранить