Signal/Desktop
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Desktop.git synced 2025-12-24 12:19:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fetch group contacts before fetching new messages

Browse Source 
Messages must wait for sender info to arrive before rendering.

// FREEBIE
This commit is contained in:
lilia
2015-09-13 20:59:51 -07:00
parent edbf2371bf
commit 1a30d003f5
2 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
js/views/inbox_view.js
View File

@@ -54,7 +54,6 @@
appWindow: this.model.appWindow
});
$el = view.$el;
conversation.fetchContacts();
if (conversation.messageCollection.length === 0) {
$el.find('.message-list').addClass('loading');
}
@@ -62,8 +61,10 @@
$el.prependTo(this.el);
$el.find('.message-list').trigger('reset-scroll');
$el.trigger('force-resize');
conversation.fetchMessages().then(function() {
$el.find('.message-list').removeClass('loading');
conversation.fetchContacts().then(function() {
conversation.fetchMessages().then(function() {
$el.find('.message-list').removeClass('loading');
});
});
conversation.markRead();
}