jonny
/
Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove conversation from left pane on 'delete messages' (#1807)

This commit is contained in:
Scott Nonnenberg 2017-11-21 16:37:58 -08:00 committed by GitHub
parent abb83a895e
commit 87d8ec723a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
js/models/conversations.js
View File

@ -984,8 +984,14 @@
}).then(function() {
var models = this.messageCollection.models;
this.messageCollection.reset([]);
_.each(models, function(message) { message.destroy(); });
this.save({lastMessage: null, timestamp: null}); // archive
_.each(models, function(message) {
message.destroy();
});
this.save({
lastMessage: null,
timestamp: null,
active_at: null,
});
}.bind(this));
},

6
js/views/conversation_list_view.js
View File

@ -28,6 +28,12 @@
$el.insertBefore(target);
}
}
},
removeItem: function(conversation) {
var $el = this.$('.' + conversation.cid);
if ($el && $el.length > 0) {
$el.remove();
}
}
});
})();

13
js/views/inbox_view.js
View File

@ -108,9 +108,16 @@
collection : inboxCollection
}).render();
this.inboxListView.listenTo(inboxCollection,
'add change:timestamp change:name change:number',
this.inboxListView.updateLocation);
this.inboxListView.listenTo(
inboxCollection,
'add change:timestamp change:name change:number',
this.inboxListView.updateLocation
);
this.inboxListView.listenTo(
inboxCollection,
'remove',
this.inboxListView.removeItem
);
this.searchView = new Whisper.ConversationSearchView({
el : this.$('.search-results'),