Fix for button appearing in both toolbars
This commit is contained in:
parent
cf49c8c6ff
commit
3b05a16b32
|
@ -123,7 +123,7 @@
|
||||||
<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">
|
<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">
|
||||||
<span id="numberOfParticipants"></span>
|
<span id="numberOfParticipants"></span>
|
||||||
</a>
|
</a>
|
||||||
<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>
|
<!--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-->
|
||||||
<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">
|
<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">
|
||||||
<span id="unreadMessages"></span>
|
<span id="unreadMessages"></span>
|
||||||
</a>
|
</a>
|
||||||
|
|
|
@ -112,7 +112,8 @@
|
||||||
* is enabled, {false} - otherwise
|
* is enabled, {false} - otherwise
|
||||||
*/
|
*/
|
||||||
isButtonEnabled: function (name) {
|
isButtonEnabled: function (name) {
|
||||||
return interfaceConfig.TOOLBAR_BUTTONS.indexOf(name) !== -1;
|
return interfaceConfig.TOOLBAR_BUTTONS.indexOf(name) !== -1
|
||||||
|
|| interfaceConfig.MAIN_TOOLBAR_BUTTONS.indexOf(name) !== -1;
|
||||||
},
|
},
|
||||||
/**
|
/**
|
||||||
* Indicates if the setting section is enabled.
|
* Indicates if the setting section is enabled.
|
||||||
|
|
Loading…
Reference in New Issue