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

Last seen indicator: Keep scroll position when window loses focus

Browse source 
FREEBIE
This commit is contained in:
Scott Nonnenberg 2017-05-25 10:57:40 -07:00
parent 3beecce94e
commit 4e9e811d12
1 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
js/views/conversation_view.js
View file

@ -116,7 +116,7 @@
var onFocus = function() { var onFocus = function() {
if (this.$el.css('display') !== 'none') { if (this.$el.css('display') !== 'none') {
this.updateUnread(); this.markRead();
} }
}.bind(this); }.bind(this);
this.window.addEventListener('focus', onFocus); this.window.addEventListener('focus', onFocus);
@ -240,7 +240,6 @@
this.scrollDownButton = new Whisper.ScrollDownButtonView({count: count}); this.scrollDownButton = new Whisper.ScrollDownButtonView({count: count});
this.scrollDownButton.render(); this.scrollDownButton.render();
var container = this.$('.discussion-container'); var container = this.$('.discussion-container');
console.log('showscrollDownButton', container);
container.append(this.scrollDownButton.el); container.append(this.scrollDownButton.el);
} }
}, },
@ -260,10 +259,22 @@
}, },
scrollToBottom: function() { scrollToBottom: function() {
// If we're above the last seen indicator, we should scroll there instead
// Note: if we don't end up at the bottom of the conversation, button will not go away!
if (this.lastSeenIndicator) {
var location = this.lastSeenIndicator.$el.position().top;
if (location > 0) {
this.lastSeenIndicator.el.scrollIntoView();
return;
}
}
this.view.scrollToBottom(); this.view.scrollToBottom();
}, },
updateLastSeenIndicator: function() { updateLastSeenIndicator: function(options) {
options = options || {};
_.defaults(options, {scroll: true});
this.removeLastSeenIndicator(); this.removeLastSeenIndicator();
var oldestUnread = this.model.messageCollection.find(function(model) { var oldestUnread = this.model.messageCollection.find(function(model) {
@ -276,7 +287,10 @@
var unreadEl = this.lastSeenIndicator.render().$el; var unreadEl = this.lastSeenIndicator.render().$el;
unreadEl.insertBefore(this.$('#' + oldestUnread.get('id'))); unreadEl.insertBefore(this.$('#' + oldestUnread.get('id')));
var position = unreadEl[0].scrollIntoView(true);
if (this.view.bottomOffset === 0 || options.scroll) {
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.
@ -328,7 +342,7 @@
message.setToExpire(); message.setToExpire();
if (!this.isHidden() && !window.isFocused()) { if (!this.isHidden() && !window.isFocused()) {
this.updateLastSeenIndicator(); this.updateLastSeenIndicator({scroll: false});
} }
else if (!this.isHidden() && window.isFocused()) { else if (!this.isHidden() && window.isFocused()) {
this.removeLastSeenIndicator(); this.removeLastSeenIndicator();