Skip to content

Commit 8ed4a42

Browse files
committed
Update controlbox to not show logo, navbar and version while connecting
1 parent 3beb417 commit 8ed4a42

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed

src/plugins/controlbox/templates/controlbox.js

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,27 @@ const { ANONYMOUS } = constants;
1111
function whenNotConnected(el) {
1212
const is_fullscreen = api.settings.get('view_mode') === 'fullscreen';
1313
const connection_status = _converse.state.connfeedback.get('connection_status');
14-
const connecting = [Strophe.Status.RECONNECTING, Strophe.Status.CONNECTING].includes(connection_status);
14+
const connecting = [Strophe.Status.RECONNECTING, Strophe.Status.CONNECTING, Strophe.Status.CONNECTED].includes(
15+
connection_status
16+
);
1517
const view_mode = api.settings.get('view_mode');
1618
const show_bg = api.settings.get('show_background');
19+
1720
return html`
1821
${show_bg && view_mode === 'fullscreen' ? html`<converse-bg></converse-bg>` : ''}
1922
<converse-controlbox-buttons class="controlbox-padded"></converse-controlbox-buttons>
2023
<div class="controlbox-pane d-flex flex-column justify-content-between">
21-
${is_fullscreen ? html`<converse-controlbox-navbar></converse-controlbox-navbar>` : ''}
22-
<converse-brand-logo></converse-brand-logo>
2324
${connecting
2425
? html`<converse-spinner class="vertically-centered fade-in"></converse-spinner>`
2526
: el.model.get('active-form') === 'register'
26-
? html`<converse-registration-form class="fade-in rounded"></converse-registration-form>`
27-
: html`<converse-login-form class="fade-in rounded"></converse-login-form>`}
28-
${is_fullscreen ? html`<converse-footer></converse-footer>` : ''}
27+
? html`${is_fullscreen ? html`<converse-controlbox-navbar></converse-controlbox-navbar>` : ''}
28+
<converse-brand-logo></converse-brand-logo>
29+
<converse-registration-form class="fade-in rounded"></converse-registration-form>
30+
${is_fullscreen ? html`<converse-footer></converse-footer>` : ''} `
31+
: html`${is_fullscreen ? html`<converse-controlbox-navbar></converse-controlbox-navbar>` : ''}
32+
<converse-brand-logo></converse-brand-logo>
33+
<converse-login-form class="fade-in rounded"></converse-login-form>
34+
${is_fullscreen ? html`<converse-footer></converse-footer>` : ''} `}
2935
</div>
3036
`;
3137
}

src/types/plugins/disco-views/disco-browser.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ declare class DiscoBrowser extends CustomElement {
3434
} | {
3535
features: any;
3636
identities: any;
37-
items: any[];
37+
items: any;
3838
error?: undefined;
3939
}>;
4040
}

0 commit comments

Comments
 (0)