diff --git a/js/views/conversation_list_item_view.js b/js/views/conversation_list_item_view.js index d380a34de..00e569f51 100644 --- a/js/views/conversation_list_item_view.js +++ b/js/views/conversation_list_item_view.js @@ -19,7 +19,6 @@ var Whisper = Whisper || {}; (function () { 'use strict'; - var bg = extension.windows.getBackground(); // list of conversations, showing user/group and last message sent Whisper.ConversationListItemView = Backbone.View.extend({ tagName: 'div', @@ -40,7 +39,7 @@ var Whisper = Whisper || {}; open: function(e) { this.$el.addClass('selected'); - bg.openConversation(this.model.id); + this.$el.trigger('open', {modelId: this.model.id}); }, stopPropagation: function(e) { diff --git a/js/views/inbox_view.js b/js/views/inbox_view.js index c85d3c339..25fa3ad0e 100644 --- a/js/views/inbox_view.js +++ b/js/views/inbox_view.js @@ -17,6 +17,7 @@ 'use strict'; window.Whisper = window.Whisper || {}; + var bg = extension.windows.getBackground(); Whisper.InboxView = Backbone.View.extend({ initialize: function () { @@ -48,7 +49,11 @@ events: { 'click .back': 'hideCompose', 'click .fab': 'showCompose', - 'keyup input.new-message': 'compose' + 'keyup input.new-message': 'compose', + 'open .contact': 'openConversation' + }, + openConversation: function(e, data) { + bg.openConversation(data.modelId); }, showCompose: function() { this.$fab.hide(); diff --git a/js/views/new_conversation_view.js b/js/views/new_conversation_view.js index f72f735e4..cc9d94bba 100644 --- a/js/views/new_conversation_view.js +++ b/js/views/new_conversation_view.js @@ -80,7 +80,7 @@ var Whisper = Whisper || {}; var query = this.$input.val(); if (query.length) { if (this.maybeNumber(query)) { - this.new_contact.model.set('name', query); + this.new_contact.model.set('id', query); this.new_contact.$el.show(); } else { this.new_contact.$el.hide();