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

Scroll on new message only if we were already at bottom

Browse source 
FREEBIE
This commit is contained in:
Scott Nonnenberg 2017-05-17 14:34:02 -07:00
parent fed26c36ca
commit bfdb8254a4
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
js/views/message_list_view.js
View file

@ -40,7 +40,10 @@
this.$el.scrollTop(scrollPosition - this.$el.outerHeight()); this.$el.scrollTop(scrollPosition - this.$el.outerHeight());
}, },
scrollToBottomIfNeeded: function() { scrollToBottomIfNeeded: function() {
this.$el.scrollTop(this.el.scrollHeight - this.bottomOffset); if (this.bottomOffset === 0) {
this.$el.scrollTop(this.el.scrollHeight);
this.measureScrollPosition();
}
}, },
addOne: function(model) { addOne: function(model) {
var view; var view;
@ -53,21 +56,17 @@
this.listenTo(view, 'beforeChangeHeight', this.measureScrollPosition); this.listenTo(view, 'beforeChangeHeight', this.measureScrollPosition);
this.listenTo(view, 'afterChangeHeight', this.scrollToBottomIfNeeded); this.listenTo(view, 'afterChangeHeight', this.scrollToBottomIfNeeded);
} }
var index = this.collection.indexOf(model); var index = this.collection.indexOf(model);
this.measureScrollPosition();
if (index === this.collection.length - 1) { if (index === this.collection.length - 1) {
// add to the bottom. // add to the bottom.
this.$el.append(view.el); this.$el.append(view.el);
this.$el.scrollTop(this.el.scrollHeight); // TODO: Avoid scrolling if user has manually scrolled up?
this.measureScrollPosition();
} else if (index === 0) { } else if (index === 0) {
// add to top // add to top
this.measureScrollPosition();
this.$el.prepend(view.el); this.$el.prepend(view.el);
this.scrollToBottomIfNeeded();
} else { } else {
// insert // insert
this.measureScrollPosition();
var next = this.$('#' + this.collection.at(index + 1).id); var next = this.$('#' + this.collection.at(index + 1).id);
var prev = this.$('#' + this.collection.at(index - 1).id); var prev = this.$('#' + this.collection.at(index - 1).id);
if (next.length > 0) { if (next.length > 0) {
@ -90,8 +89,8 @@
this.$el.append(view.el); this.$el.append(view.el);
} }
} }
this.scrollToBottomIfNeeded();
} }
this.scrollToBottomIfNeeded();
}, },
}); });
})(); })();