Skip to content

Commit 0c6b78e

Browse files
committed
revert back code to avoid merge conflicts
1 parent fdc537d commit 0c6b78e

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

src/plugins/chatview/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ converse.plugins.add('converse-chatview', {
5151
'time_format': 'HH:mm',
5252
'use_system_emojis': true,
5353
'visible_toolbar_buttons': {
54-
'call': true,
54+
'call': false,
5555
'clear': true,
5656
'emoji': true,
5757
'spoiler': true

src/shared/chat/toolbar.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,16 @@ export class ChatToolbar extends CustomElement {
5454
buttons.push(html`<converse-emoji-dropdown .chatview=${chatview}></converse-emoji-dropdown>`);
5555
}
5656

57+
if (this.show_call_button) {
58+
const color = this.is_groupchat ? '--muc-toolbar-btn-color' : '--chat-toolbar-btn-color';
59+
const i18n_start_call = __('Start a call');
60+
buttons.push(html`
61+
<button class="toggle-call" @click=${this.toggleCall} title="${i18n_start_call}">
62+
<converse-icon color="var(${color})" class="fa fa-phone" size="1em"></converse-icon>
63+
</button>`
64+
);
65+
}
66+
5767
const message_limit = api.settings.get('message_limit');
5868
if (message_limit) {
5969
buttons.push(html`

0 commit comments

Comments
 (0)