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

Some improvements to scrolling.

Browse Source
This commit is contained in:
JC Brand 2015-07-17 23:46:02 +02:00
parent 36306c7418
commit 3b2b4ed6c7
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
converse.js
View File

@ -1399,6 +1399,7 @@
fullname = this.model.get('fullname') || msg_dict.fullname, fullname = this.model.get('fullname') || msg_dict.fullname,
extra_classes = msg_dict.delayed && 'delayed' || '', extra_classes = msg_dict.delayed && 'delayed' || '',
num_messages = this.model.messages.length, num_messages = this.model.messages.length,
has_scrollbar = $content.get(0).scrollHeight > $content[0].clientHeight,
template, username, insertMessage; template, username, insertMessage;
// FIXME: A better approach here is probably to look at what is // FIXME: A better approach here is probably to look at what is
@ -1407,7 +1408,11 @@
// 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(this.scrollDown.bind(this), $content.prepend.bind($content));
} else {
insertMessage = $content.prepend.bind($content); insertMessage = $content.prepend.bind($content);
}
} else { } else {
insertMessage = _.compose(this.scrollDown.bind(this), $content.append.bind($content)); insertMessage = _.compose(this.scrollDown.bind(this), $content.append.bind($content));
} }
@ -1495,7 +1500,7 @@
converse.incrementMsgCounter(); converse.incrementMsgCounter();
} }
if (!this.model.get('minimized') && !this.$el.is(':visible')) { if (!this.model.get('minimized') && !this.$el.is(':visible')) {
this.show(); _.debounce(this.show, 100);
} }
}, },
@ -1959,7 +1964,10 @@
if (this.$el.is(':visible') && this.$el.css('opacity') == "1") { if (this.$el.is(':visible') && this.$el.css('opacity') == "1") {
return this.focus(); return this.focus();
} }
this.$el.fadeIn(callback); this.$el.fadeIn(function () {
if (typeof callback == "function") {
callback.apply(this, arguments);
}
if (converse.connection.connected) { if (converse.connection.connected) {
// Without a connection, we haven't yet initialized // Without a connection, we haven't yet initialized
// localstorage // localstorage
@ -1967,7 +1975,10 @@
this.initDragResize(); this.initDragResize();
} }
this.setChatState(ACTIVE); this.setChatState(ACTIVE);
return this.scrollDown().focus(); this.scrollDown().focus();
}.bind(this)
);
return this;
}, },
scrollDown: function () { scrollDown: function () {