Переглянути джерело

Fix order of overlayed chat buttons

JC Brand 1 тиждень тому
батько
коміт
8ac2f3c54f

+ 4 - 4
src/plugins/chatview/heading.js

@@ -1,8 +1,8 @@
-import 'shared/modals/user-details.js';
-import tplChatboxHead from './templates/chat-head.js';
+import { _converse, api, converse } from "@converse/headless";
 import { CustomElement } from 'shared/components/element.js';
 import { __ } from 'i18n';
-import { _converse, api, converse } from "@converse/headless";
+import tplChatboxHead from './templates/chat-head.js';
+import 'shared/modals/user-details.js';
 
 import './styles/chat-head.scss';
 
@@ -73,7 +73,7 @@ export default class ChatHeading extends CustomElement {
                 i18n_title: __('See more information about this person'),
                 icon_class: 'fa-id-card',
                 name: 'details',
-                standalone: api.settings.get('view_mode') === 'overlayed'
+                standalone: false,
             },
         ];
 

+ 1 - 1
src/plugins/chatview/templates/chat-head.js

@@ -44,8 +44,8 @@ export default (el) => {
                 </div>
             </div>
             <div class="chatbox-title__buttons btn-toolbar g-0">
-                ${until(getDropdownButtons(heading_buttons_promise), "")}
                 ${until(getStandaloneButtons(heading_buttons_promise), "")}
+                ${until(getDropdownButtons(heading_buttons_promise), "")}
             </div>
         </div>
         ${status ? html`<p class="chat-head__desc">${status}</p>` : ""}

+ 1 - 1
src/plugins/rosterview/tests/unsaved-contacts.js

@@ -1,6 +1,6 @@
 const { stx, u } = converse.env;
 
-fdescribe('An unsaved Contact', function () {
+describe('An unsaved Contact', function () {
     it(
         'is shown upon receiving a message',
         mock.initConverse([], {}, async function (_converse) {

+ 0 - 1
src/types/plugins/controlbox/controlbox.d.ts

@@ -8,7 +8,6 @@ export default ControlBoxView;
  */
 declare class ControlBoxView extends CustomElement {
     initialize(): void;
-    setModel(): void;
     model: any;
     render(): import("lit-html").TemplateResult<1> | "";
     close(ev: any): this;