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

signalapp · Nov 22, 2017 · 87d8ec7 · 87d8ec7
1 parent abb83a8
commit 87d8ec7
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 5 deletions.
diff --git a/js/models/conversations.js b/js/models/conversations.js
@@ -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));
     },
 

diff --git a/js/views/conversation_list_view.js b/js/views/conversation_list_view.js
@@ -28,6 +28,12 @@
                     $el.insertBefore(target);
                 }
             }
+        },
+        removeItem: function(conversation) {
+            var $el = this.$('.' + conversation.cid);
+            if ($el && $el.length > 0) {
+                $el.remove();
+            }
         }
     });
 })();
diff --git a/js/views/inbox_view.js b/js/views/inbox_view.js
@@ -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'),