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

Update the scroll position when 'fetch more messages' is complete

Browse source 
FREEBIE
This commit is contained in:
Scott Nonnenberg 2017-06-01 11:30:14 -07:00
parent 3dbb21c53c
commit 0b6d5de753
1 changed files with 22 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

23
js/views/conversation_view.js
View file

@ -156,7 +156,7 @@
'focus .send-message': 'focusBottomBar', 'focus .send-message': 'focusBottomBar',
'change .file-input': 'toggleMicrophone', 'change .file-input': 'toggleMicrophone',
'blur .send-message': 'unfocusBottomBar', 'blur .send-message': 'unfocusBottomBar',
'loadMore .message-list': 'fetchMessages', 'loadMore .message-list': 'loadMoreMessages',
'newOffscreenMessage .message-list': 'addScrollDownButtonWithCount', 'newOffscreenMessage .message-list': 'addScrollDownButtonWithCount',
'atBottom .message-list': 'hideScrollDownButton', 'atBottom .message-list': 'hideScrollDownButton',
'farFromBottom .message-list': 'addScrollDownButton', 'farFromBottom .message-list': 'addScrollDownButton',
@ -312,6 +312,27 @@
this.$messageField.focus(); this.$messageField.focus();
}, },
loadMoreMessages: function() {
if (this.inProgressFetch) {
return;
}
this.view.measureScrollPosition();
var startingHeight = this.view.scrollHeight;
this.fetchMessages().then(function() {
// We delay this work to let scrolling/layout settle down first
setTimeout(function() {
this.view.measureScrollPosition();
var endingHeight = this.view.scrollHeight;
var delta = endingHeight - startingHeight;
var newScrollPosition = this.view.scrollPosition + delta - this.view.
this.view.$el.scrollTop(newScrollPosition);
}.bind(this), 1);
}.bind(this));
},
fetchMessages: function() { fetchMessages: function() {
console.log('fetchMessages'); console.log('fetchMessages');
this.$('.bar-container').show(); this.$('.bar-container').show();