Explorar o código

Minor adjustments

On the path towards still showing the full UI while reconnecting.

- Don't throw an error because `getDefaultMUCNickname` was called too early.
- Some CSS tweaks
JC Brand hai 11 meses
pai
achega
3b957de209

+ 3 - 3
src/headless/plugins/muc/utils.js

@@ -143,9 +143,9 @@ export function getDefaultMUCNickname () {
     // locked_muc_nickname setting.
     const { xmppstatus } = _converse.state;
     if (!xmppstatus) {
-        throw new Error(
-            "Can't call _converse.getDefaultMUCNickname before the statusInitialized has been fired."
-        );
+        log.error("Called getDefaultMUCNickname before statusInitialized has been fired.");
+        return '';
+
     }
     const nick = xmppstatus.getNickname();
     if (nick) {

+ 0 - 2
src/plugins/muc-views/modals/add-muc.js

@@ -28,12 +28,10 @@ export default class AddMUCModal extends BaseModal {
     }
 
     getModalTitle () {
-        // eslint-disable-line class-methods-use-this
         return __('Enter a new Groupchat');
     }
 
     parseRoomDataFromEvent (form) {
-        // eslint-disable-line class-methods-use-this
         const data = new FormData(form);
         const jid = /** @type {string} */ (data.get('chatroom'))?.trim();
         let nick;

+ 2 - 2
src/plugins/muc-views/modals/templates/add-muc.js

@@ -1,6 +1,6 @@
 import DOMPurify from 'dompurify';
 import { __ } from 'i18n';
-import { api } from '@converse/headless';
+import { _converse, api } from '@converse/headless';
 import { html } from 'lit';
 import { unsafeHTML } from 'lit/directives/unsafe-html.js';
 import { getAutoCompleteList } from '../../search.js';
@@ -16,7 +16,7 @@ const nickname_input = (el) => {
                 title="${i18n_required_field}"
                 required="required"
                 name="nickname"
-                value="${el.model.get('nick') || ''}"
+                value="${_converse.exports.getDefaultMUCNickname() || ''}"
                 class="form-control"
             />
         </div>

+ 0 - 1
src/plugins/muc-views/styles/muc-occupants.scss

@@ -44,7 +44,6 @@
                 .occupants-header--title {
                     display: flex;
                     flex-direction: row;
-                    margin-bottom: 0.5em;
                     padding: 0.5em;
 
                     .occupants-heading {

+ 1 - 1
src/plugins/muc-views/utils.js

@@ -115,7 +115,7 @@ export function getChatRoomBodyTemplate (o) {
         return html`
             ${ conn_status == RS.PASSWORD_REQUIRED ? html`<converse-muc-password-form class="muc-form-container" jid="${jid}"></converse-muc-password-form>` : '' }
             ${ conn_status == RS.ENTERED ? html`<converse-muc-chatarea class="row g-0" jid="${jid}"></converse-muc-chatarea>` : '' }
-            ${ conn_status == RS.CONNECTING ? tplSpinner() : '' }
+            ${ conn_status == RS.CONNECTING ? tplSpinner({class: 'vertically-centered'}) : '' }
             ${ conn_status == RS.NICKNAME_REQUIRED ? getNicknameRequiredTemplate(o.model) : '' }
             ${ conn_status == RS.DISCONNECTED ? html`<converse-muc-disconnected jid="${jid}"></converse-muc-disconnected>` : '' }
             ${ conn_status == RS.BANNED ? html`<converse-muc-disconnected jid="${jid}"></converse-muc-disconnected>` : '' }

+ 1 - 2
src/plugins/roomslist/model.js

@@ -6,10 +6,9 @@ const { OPENED } = constants;
 
 class RoomsListModel extends Model {
 
-    defaults () {  // eslint-disable-line class-methods-use-this
+    defaults () {
         return {
             'muc_domain': api.settings.get('muc_domain'),
-            'nick': _converse.exports.getDefaultMUCNickname(),
             'toggle_state':  OPENED,
             'collapsed_domains': [],
         };

+ 1 - 1
src/templates/styles/spinner.scss

@@ -1,5 +1,5 @@
 .spinner-grow {
     .vertically-centered > & {
-        margin-top: 50vh;
+        margin-top: 30%;
     }
 }