diff --git a/js/models/conversations.js b/js/models/conversations.js index 2d3ee1894..6d3802e74 100644 --- a/js/models/conversations.js +++ b/js/models/conversations.js @@ -89,8 +89,6 @@ active_at : now, timestamp : now, lastMessage : body - }).then(function() { - ConversationController.updateInbox(); }); var sendFunc; @@ -113,9 +111,7 @@ } }); if (keyErrors.length) { - message.save({ errors : keyErrors }).then(function() { - ConversationController.updateInbox(); - }); + message.save({ errors : keyErrors }); } else { if (!(errors instanceof Array)) { errors = [errors]; @@ -198,18 +194,11 @@ }.bind(this)); }, - archive: function() { - this.set({active_at: null}); - }, - destroyMessages: function() { var models = this.messageCollection.models; this.messageCollection.reset([]); _.each(models, function(message) { message.destroy(); }); - this.archive(); - return this.save().then(function() { - ConversationController.updateInbox(); - }); + this.save({active_at: null}); // archive }, getTitle: function() { diff --git a/js/panel_controller.js b/js/panel_controller.js index 692c771cf..b5cd2a0bd 100644 --- a/js/panel_controller.js +++ b/js/panel_controller.js @@ -50,7 +50,6 @@ }); } else { openConversation(conversation); - ConversationController.updateInbox(); } };