Selaa lähdekoodia

Make `show_images` a prop of `converse-chat-mesage-body`

That way, when the setting changes and we call `requestUpdate` on
`converse-chat-message`, the body will rerender.
JC Brand 4 vuotta sitten
vanhempi
commit
1f7fecab21

+ 3 - 3
src/plugins/chatview/tests/message-images.js

@@ -131,10 +131,10 @@ describe("A Chat Message", function () {
         await mock.openChatBoxFor(_converse, contact_jid);
         const view = _converse.api.chatviews.get(contact_jid);
         await mock.sendMessage(view, message);
-        await u.waitUntil(() => view.querySelectorAll('.chat-content .chat-msg').length === 1);
+        await u.waitUntil(() => view.querySelectorAll('converse-chat-message-body .chat-image').length === 1);
         api.settings.set('show_images_inline', false);
-        view.querySelector('converse-chat-message-body').requestUpdate();
-        await u.waitUntil(() => view.querySelector('.chat-content .chat-image') === null);
+        view.querySelector('converse-chat-message').requestUpdate();
+        await u.waitUntil(() => view.querySelector('converse-chat-message-body .chat-image') === null);
         expect(true).toBe(true);
         done();
     }));

+ 2 - 1
src/shared/chat/message-body.js

@@ -11,6 +11,7 @@ export default class MessageBody extends CustomElement {
         return {
             model: { type: Object },
             is_me_message: { type: Boolean },
+            show_images: { type: Boolean },
             text: { type: String },
         }
     }
@@ -33,7 +34,7 @@ export default class MessageBody extends CustomElement {
             'onImgClick': this.onImgClick,
             'onImgLoad': () => this.onImgLoad(),
             'render_styling': !this.model.get('is_unstyled') && api.settings.get('allow_message_styling'),
-            'show_images': api.settings.get('show_images_inline'),
+            'show_images': this.show_images,
             'show_me_message': true
         }
         return renderRichText(this.text, offset, mentions, options, callback);

+ 1 - 3
src/shared/chat/message.js

@@ -254,9 +254,7 @@ export default class Message extends CustomElement {
                     class="chat-msg__text ${this.model.get('is_only_emojis') ? 'chat-msg__text--larger' : ''} ${spoiler_classes}"
                     .model="${this.model}"
                     ?is_me_message="${this.model.isMeCommand()}"
-                    ?is_only_emojis="${this.model.get('is_only_emojis')}"
-                    ?is_spoiler="${this.model.get('is_spoiler')}"
-                    ?is_spoiler_visible="${this.model.get('is_spoiler_visible')}"
+                    ?show_images="${api.settings.get('show_images_inline')}"
                     text="${text}"></converse-chat-message-body>
                 ${ (this.model.get('received') && !this.model.isMeCommand() && !is_groupchat_message) ? html`<span class="fa fa-check chat-msg__receipt"></span>` : '' }
                 ${ (this.model.get('edited')) ? html`<i title="${ i18n_edited }" class="fa fa-edit chat-msg__edit-modal" @click=${this.showMessageVersionsModal}></i>` : '' }