diff --git a/js/views/conversation_list_item_view.js b/js/views/conversation_list_item_view.js index 0aa3e5313e..dc19b0773c 100644 --- a/js/views/conversation_list_item_view.js +++ b/js/views/conversation_list_item_view.js @@ -21,6 +21,7 @@ var Whisper = Whisper || {}; }, open: function(e) { + $('#main').trigger('close'); // detach any existing conversation views var v = new Whisper.ConversationView({el: $('#main'), model: this.model}); }, diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js index b6d2e20bd7..61e1e2f3d0 100644 --- a/js/views/conversation_view.js +++ b/js/views/conversation_view.js @@ -6,11 +6,13 @@ var Whisper = Whisper || {}; Whisper.ConversationView = Backbone.View.extend({ initialize: function() { this.listenTo(this.model, 'destroy', this.remove); // auto update + var v = new Whisper.MessageListView({collection: this.model.messages()}); v.render(); }, events: { 'submit #new-message': 'sendMessage', + 'close': 'remove' }, sendMessage: function(e) {