Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
24
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Fix display of lgoged-out controlbox in fullpage mode

Browse Source
This commit is contained in:
JC Brand 2021-02-10 11:37:48 +01:00
parent 78fb5935c7
commit a32b7b64bf
5 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sass/_chatbox.scss
View File

@ -597,7 +597,7 @@
.chat-body {
height: inherit;
overflow: hidden;
background-color: var(--chat-head-color);
background-color: var(--chat-background-color);
}
.chat-title {
font-size: var(--font-size-huge);

2
sass/_variables.scss
View File

@ -38,6 +38,8 @@ $mobile_portrait_length: 480px !default;
--message-avatar-width: 36px;
--message-avatar-height: 36px;
--chat-background-color: white;
--chat-textarea-color: #666;
--chat-textarea-background-color: white;
--chat-textarea-height: 60px;

5
src/plugins/chatboxviews/templates/chats.js
View File

@ -5,7 +5,8 @@ import { _converse, api } from '@converse/headless/core';
export default () => {
const { chatboxes, CONTROLBOX_TYPE, CHATROOMS_TYPE, HEADLINES_TYPE } = _converse;
const view_mode = api.settings.get('view_mode');
const connection = _converse?.connection;
const logged_out = !connection?.connected || !connection?.authenticated || connection?.disconnecting;
return html`
${view_mode === 'overlayed' ? html`<converse-minimized-chats></converse-minimized-chats>` : ''}
${repeat(chatboxes, m => m.get('jid'), m => {
@ -14,7 +15,7 @@ export default () => {
${view_mode === 'overlayed' ? html`<converse-controlbox-toggle class="${!m.get('closed') ? 'hidden' : ''}"></converse-controlbox-toggle>` : ''}
<converse-controlbox
id="controlbox"
class="chatbox ${m.get('closed') ? 'hidden' : ''}"
class="chatbox ${m.get('closed') ? 'hidden' : ''} ${logged_out ? 'logged-out': ''}"
style="${m.get('width') ? `width: ${m.get('width')}` : ''}"></converse-controlbox>
`;
} else if (m.get('type') === CHATROOMS_TYPE) {

6
src/plugins/chatboxviews/view.js
View File

@ -16,6 +16,12 @@ class ConverseChats extends ElementView {
this.listenTo(this.model, 'change:minimized', this.render);
this.listenTo(this.model, 'destroy', this.render);
// Use listenTo instead of api.listen.to so that event handlers
// automatically get deregistered when the component is dismounted
this.listenTo(_converse, 'connected', this.render);
this.listenTo(_converse, 'reconnected', this.render);
this.listenTo(_converse, 'disconnected', this.render);
const bg = document.getElementById('conversejs-bg');
if (bg && !bg.innerHTML.trim()) {
render(tpl_background_logo(), bg);

7
src/plugins/controlbox/view.js
View File

@ -58,13 +58,6 @@ class ControlBoxView extends ElementView {
if (this.model.get('connected') && this.model.get('closed') === undefined) {
this.model.set('closed', !api.settings.get('show_controlbox_by_default'));
}
const connection = _converse?.connection;
if (!connection?.connected || !connection?.authenticated || connection?.disconnecting) {
this.classList.add('logged-out');
} else {
this.classList.remove('logged-out');
}
}
close (ev) {