Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
25
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Improvement. Don't lose your place with infinite upscroll.

Browse Source 
updates #306
This commit is contained in:
JC Brand 2015-07-18 09:20:13 +02:00
parent 796582d96f
commit ec02d34af9
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
converse.js
View File

@ -1396,13 +1396,15 @@
// That way we could probably also better show day indicators. // That way we could probably also better show day indicators.
// That code should perhaps go into onMessageAdded // That code should perhaps go into onMessageAdded
if (num_messages && msg_time.isBefore(this.model.messages.at(0).get('time'))) { if (num_messages && msg_time.isBefore(this.model.messages.at(0).get('time'))) {
if (! has_scrollbar || $content.scrollTop() !== 0) { insertMessage = _.compose(
insertMessage = _.compose(this.scrollDown.bind(this), $content.prepend.bind($content)); this.scrollDownMessageHeight.bind(this),
} else { function ($el) {
insertMessage = $content.prepend.bind($content); $content.prepend($el);
return $el;
} }
);
} else { } else {
insertMessage = _.compose(this.scrollDown.bind(this), $content.append.bind($content)); insertMessage = _.compose(_.debounce(this.scrollDown.bind(this), 50), $content.append.bind($content));
} }
if ((match) && (match[1] === 'me')) { if ((match) && (match[1] === 'me')) {
text = text.replace(/^\/me/, ''); text = text.replace(/^\/me/, '');
@ -1969,6 +1971,14 @@
return this; return this;
}, },
scrollDownMessageHeight: function ($message) {
var $content = this.$('.chat-content');
if ($content.is(':visible')) {
$content.scrollTop($content.scrollTop() + $message[0].scrollHeight);
}
return this;
},
scrollDown: function () { scrollDown: function () {
var $content = this.$('.chat-content'); var $content = this.$('.chat-content');
if ($content.is(':visible')) { if ($content.is(':visible')) {