diff --git a/js/views/conversation_search_view.js b/js/views/conversation_search_view.js index 3db9e8094..7a04f5f13 100644 --- a/js/views/conversation_search_view.js +++ b/js/views/conversation_search_view.js @@ -26,7 +26,6 @@ events: { 'select .new-contact': 'createConversation', - 'select .contacts': 'open' }, filterContacts: function(e) { @@ -72,17 +71,13 @@ ConversationController.findOrCreatePrivateById( this.new_contact_view.model.id ).then(function(conversation) { - this.$el.trigger('open', conversation); + this.trigger('open', conversation); this.initNewContact(); this.resetTypeahead(); }.bind(this)); } }, - open: function(e, conversation) { - this.$el.trigger('open', conversation); - }, - reset: function() { this.delegateEvents(); this.typeahead_view.delegateEvents(); diff --git a/js/views/inbox_view.js b/js/views/inbox_view.js index a9a58dc70..97bf2428a 100644 --- a/js/views/inbox_view.js +++ b/js/views/inbox_view.js @@ -98,6 +98,8 @@ this.searchView.$el.show(); this.inboxListView.$el.hide(); }); + this.listenTo(this.searchView, 'open', + this.openConversation.bind(this, null)); if (inboxCollection.length === 0) { this.searchView.showAllContacts = true; @@ -120,7 +122,7 @@ 'click .hamburger': 'toggleMenu', 'click .show-debug-log': 'showDebugLog', 'click .show-new-conversation': 'showCompose', - 'select .gutter .contact': 'openConversation', + 'select .gutter .conversation-list-item': 'openConversation', 'input input.search': 'filterContacts' }, filterContacts: function(e) {