mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

20px at bottom of conversation considered 'at the bottom'

Browse source 
So users who are 'close enough' at the bottom of the conversation won't
get marooned in history.

FREEBIE
This commit is contained in:
Scott Nonnenberg 2017-05-26 17:24:51 -07:00
parent cc4d2993d1
commit 84397a2ef4
2 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
js/views/conversation_view.js
View file

@ -291,14 +291,14 @@
unreadEl.insertBefore(this.$('#' + oldestUnread.get('id'))); unreadEl.insertBefore(this.$('#' + oldestUnread.get('id')));
if (this.view.bottomOffset === 0 || options.scroll) { if (this.view.atBottom() || options.scroll) {
var position = unreadEl[0].scrollIntoView(true); var position = unreadEl[0].scrollIntoView(true);
} }
// scrollIntoView is an async operation, but we have no way to listen for // scrollIntoView is an async operation, but we have no way to listen for
// completion of the resultant scroll. // completion of the resultant scroll.
setTimeout(function() { setTimeout(function() {
if (this.view.bottomOffset > 0) { if (!this.view.atBottom()) {
this.addScrollDownButtonWithCount(unreadCount); this.addScrollDownButtonWithCount(unreadCount);
} }
}.bind(this), 1); }.bind(this), 1);

17
js/views/message_list_view.js
View file

@ -17,12 +17,15 @@
if (this.$el.scrollTop() === 0) { if (this.$el.scrollTop() === 0) {
this.$el.trigger('loadMore'); this.$el.trigger('loadMore');
} }
if (this.bottomOffset === 0) { if (this.atBottom()) {
this.$el.trigger('atBottom'); this.$el.trigger('atBottom');
} else if (this.bottomOffset > this.outerHeight) { } else if (this.bottomOffset > this.outerHeight) {
this.$el.trigger('farFromBottom'); this.$el.trigger('farFromBottom');
} }
}, },
atBottom: function() {
return this.bottomOffset < 20;
},
measureScrollPosition: function() { measureScrollPosition: function() {
if (this.el.scrollHeight === 0) { // hidden if (this.el.scrollHeight === 0) { // hidden
return; return;
@ -30,18 +33,13 @@
this.outerHeight = this.$el.outerHeight(); this.outerHeight = this.$el.outerHeight();
this.scrollPosition = this.$el.scrollTop() + this.outerHeight; this.scrollPosition = this.$el.scrollTop() + this.outerHeight;
this.scrollHeight = this.el.scrollHeight; this.scrollHeight = this.el.scrollHeight;
this.shouldStickToBottom = this.scrollPosition === this.scrollHeight; this.bottomOffset = this.scrollHeight - this.$el.scrollTop() - this.outerHeight;
if (this.shouldStickToBottom) {
this.bottomOffset = 0;
} else {
this.bottomOffset = this.scrollHeight - this.$el.scrollTop() - this.outerHeight;
}
}, },
resetScrollPosition: function() { resetScrollPosition: function() {
this.$el.scrollTop(this.scrollPosition - this.$el.outerHeight()); this.$el.scrollTop(this.scrollPosition - this.$el.outerHeight());
}, },
scrollToBottomIfNeeded: function() { scrollToBottomIfNeeded: function() {
if (this.bottomOffset === 0) { if (this.atBottom()) {
this.scrollToBottom(); this.scrollToBottom();
} }
}, },
@ -63,7 +61,8 @@
var index = this.collection.indexOf(model); var index = this.collection.indexOf(model);
this.measureScrollPosition(); this.measureScrollPosition();
if (model.get('unread') && this.bottomOffset > 0) {
if (model.get('unread') && !this.atBottom()) {
this.$el.trigger('newOffscreenMessage'); this.$el.trigger('newOffscreenMessage');
} }