Преглед на файлове

Get rid of `showMessage` method

JC Brand преди 5 години
родител
ревизия
034b174046
променени са 3 файла, в които са добавени 2 реда и са изтрити 44 реда
  1. 2 1
      src/components/chat_content.js
  2. 0 36
      src/converse-chatview.js
  3. 0 7
      src/converse-omemo.js

+ 2 - 1
src/components/chat_content.js

@@ -31,7 +31,8 @@ function getDayIndicator (model) {
 
 
 function renderMessage (model) {
-    if (model.get('dangling_retraction')) {
+    // XXX: leaky abstraction "is_only_key" from converse-omemo
+    if (model.get('dangling_retraction') || model.get('is_only_key')) {
         return '';
     }
     const day = getDayIndicator(model);

+ 0 - 36
src/converse-chatview.js

@@ -728,42 +728,6 @@ converse.plugins.add('converse-chatview', {
                 }
             },
 
-            /**
-             * Inserts a chat message into the content area of the chat box.
-             * Will also insert a new day indicator if the message is on a different day.
-             * @private
-             * @method _converse.ChatBoxView#showMessage
-             * @param { _converse.Message } message - The message object
-             */
-            async showMessage (message) {
-                await message.initialized;
-                const view = this.add(message.get('id'), new _converse.MessageView({'model': message}));
-                await view.render();
-                this.insertMessage(view);
-                this.insertDayIndicator(view.el);
-                this.setScrollPosition(view.el);
-
-                if (u.isNewMessage(message)) {
-                    if (message.get('sender') === 'me') {
-                        // We remove the "scrolled" flag so that the chat area
-                        // gets scrolled down. We always want to scroll down
-                        // when the user writes a message as opposed to when a
-                        // message is received.
-                        this.model.set('scrolled', false);
-                    } else if (this.model.get('scrolled', true)) {
-                        this.showNewMessagesIndicator();
-                    }
-                }
-                if (this.shouldShowOnTextMessage()) {
-                    this.show();
-                } else {
-                    this.scrollDown();
-                }
-                if (message.get('correcting')) {
-                    this.insertIntoTextArea(message.get('message'), true, true);
-                }
-            },
-
             parseMessageForCommands (text) {
                 const match = text.replace(/^\s*/, "").match(/^\/(.*)\s*$/);
                 if (match) {

+ 0 - 7
src/converse-omemo.js

@@ -194,13 +194,6 @@ converse.plugins.add('converse-omemo', {
                 this.__super__.initialize.apply(this, arguments);
                 this.listenTo(this.model, 'change:omemo_active', this.renderOMEMOToolbarButton);
                 this.listenTo(this.model, 'change:omemo_supported', this.onOMEMOSupportedDetermined);
-            },
-
-            showMessage (message) {
-                // We don't show a message if it's only keying material
-                if (!message.get('is_only_key')) {
-                    return this.__super__.showMessage.apply(this, arguments);
-                }
             }
         },