From 9e245e67e076e40aa9b23a7434ce650de618df9f Mon Sep 17 00:00:00 2001 From: lilia Date: Sun, 1 Feb 2015 18:37:10 -1000 Subject: [PATCH] Fix double-opening exsisting conversations from typeahead --- js/views/inbox_view.js | 2 +- js/views/new_conversation_view.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/js/views/inbox_view.js b/js/views/inbox_view.js index 288bfc94d..1e9230a43 100644 --- a/js/views/inbox_view.js +++ b/js/views/inbox_view.js @@ -52,7 +52,7 @@ 'click .fab': 'showCompose', 'open #contacts': 'openConversation', 'open .contacts': 'openConversation', - 'open .new-conversation': 'openConversation', + 'open .new-group-update-form': 'openConversation', 'open .new-contact': 'createConversation', }, openConversation: function(e, data) { diff --git a/js/views/new_conversation_view.js b/js/views/new_conversation_view.js index 0ad05d796..e1e9a99f2 100644 --- a/js/views/new_conversation_view.js +++ b/js/views/new_conversation_view.js @@ -103,7 +103,7 @@ var Whisper = Whisper || {}; var id = getString(groupId); var group = new Whisper.Conversation(attributes); group.save({ id: id, groupId: id }).then(function() { - this.$el.trigger('open', {modelId: id}); + this.$group_update.trigger('open', {modelId: id}); }.bind(this)); }.bind(this)); }.bind(this));