Prechádzať zdrojové kódy

Bugfix. Don't scroll down if the user had manually scrolled up

JC Brand 5 rokov pred
rodič
commit
061142e0c3
2 zmenil súbory, kde vykonal 4 pridanie a 4 odobranie
  1. 2 3
      src/converse-chatview.js
  2. 2 1
      src/converse-muc-views.js

+ 2 - 3
src/converse-chatview.js

@@ -243,7 +243,6 @@ converse.plugins.add('converse-chatview', {
                 const result = tpl_chatbox(
                     Object.assign(
                         this.model.toJSON(), {
-                            'unread_msgs': __('You have unread messages'),
                             'markScrolled': () => this.markScrolled()
                         }
                     )
@@ -1137,8 +1136,8 @@ converse.plugins.add('converse-chatview', {
             _markScrolled: function () {
                 let scrolled = true;
                 const is_at_bottom =
-                    (this.content.scrollTop + this.content.clientHeight) >=
-                        this.content.scrollHeight - 62; // sigh...
+                    (this.msgs_container.scrollTop + this.msgs_container.clientHeight) >=
+                        this.msgs_container.scrollHeight - 62; // sigh...
 
                 if (is_at_bottom) {
                     scrolled = false;

+ 2 - 1
src/converse-muc-views.js

@@ -512,8 +512,9 @@ converse.plugins.add('converse-muc-views', {
             async render () {
                 this.el.setAttribute('id', this.model.get('box_id'));
                 render(tpl_chatroom({
+                    'markScrolled': () => this.markScrolled(),
                     'muc_show_logs_before_join': api.settings.get('muc_show_logs_before_join'),
-                    'show_send_button': _converse.show_send_button
+                    'show_send_button': _converse.show_send_button,
                 }), this.el);
 
                 this.notifications = this.el.querySelector('.chat-content__notifications');