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

Left pane: small sorting fix, logging for error cases (#1969)

Browse source
This commit is contained in:
Scott Nonnenberg 2018-01-12 16:22:00 -08:00 • committed by GitHub
commit 743e897541
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 38 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

32
js/views/conversation_list_view.js
View file

@ -10,10 +10,33 @@
itemView: Whisper.ConversationListItemView, itemView: Whisper.ConversationListItemView,
updateLocation: function(conversation) { updateLocation: function(conversation) {
var $el = this.$('.' + conversation.cid); var $el = this.$('.' + conversation.cid);
if ($el && $el.length > 0) {
if (!$el || !$el.length) {
console.log(
'updateLocation: did not find element for conversation',
conversation.idForLogging()
);
return;
}
if ($el.length > 1) {
console.log(
'updateLocation: found more than one element for conversation',
conversation.idForLogging()
);
return;
}
var $allConversations = this.$('.conversation-list-item');
var inboxCollection = getInboxCollection(); var inboxCollection = getInboxCollection();
var index = inboxCollection.indexOf(conversation); var index = inboxCollection.indexOf(conversation);
var elIndex = this.$el.index($el);
var elIndex = $allConversations.index($el);
if (elIndex < 0) {
console.log(
'updateLocation: did not find index for conversation',
conversation.idForLogging()
);
}
if (index === elIndex) { if (index === elIndex) {
return; return;
@ -23,10 +46,9 @@
} else if (index === this.collection.length - 1) { } else if (index === this.collection.length - 1) {
this.$el.append($el); this.$el.append($el);
} else { } else {
var targetConversation = inboxCollection.at(index + 1); var targetConversation = inboxCollection.at(index - 1);
var target = this.$('.' + targetConversation.cid); var target = this.$('.' + targetConversation.cid);
$el.insertBefore(target); $el.insertAfter(target);
}
} }
}, },
removeItem: function(conversation) { removeItem: function(conversation) {