diff --git a/js/models/threads.js b/js/models/threads.js index 66acaf7b..16f2eacb 100644 --- a/js/models/threads.js +++ b/js/models/threads.js @@ -43,7 +43,6 @@ var Whisper = Whisper || {}; if (!this.messageCollection) { this.messageCollection = new Whisper.MessageCollection([], {threadId: this.id}); } - this.messageCollection.fetch(); return this.messageCollection; }, }); diff --git a/js/views/conversation_list_view.js b/js/views/conversation_list_view.js index db00c22f..7ea57ed0 100644 --- a/js/views/conversation_list_view.js +++ b/js/views/conversation_list_view.js @@ -11,7 +11,6 @@ var Whisper = Whisper || {}; events: { 'select .conversation': 'select', - 'deselect': 'deselect' }, select: function(e) { @@ -20,10 +19,5 @@ var Whisper = Whisper || {}; target.addClass('selected').trigger('open'); return false; }, - - deselect: function() { - this.$el.find('.selected').removeClass('selected').trigger('close'); - this.$el.find('.conversation').show(); - } }); })(); diff --git a/js/views/conversations/show.js b/js/views/conversations/show.js index 802df8ec..105f5c45 100644 --- a/js/views/conversations/show.js +++ b/js/views/conversations/show.js @@ -3,32 +3,6 @@ var Whisper = Whisper || {}; (function () { 'use strict'; - var destroyer = Backbone.View.extend({ - tagName: 'button', - className: 'btn btn-square btn-sm destroy', - events: { - 'click': 'destroy' - }, - initialize: function() { - this.$el.html('×'); - }, - - destroy: function() { - this.model.messages().each(function(message) { message.destroy(); }); - this.model.set('active', false); - this.model.save(); - this.model.trigger('destroy'); - } - }); - - var menu = Backbone.View.extend({ - tagName: 'ul', - className: 'menu', - initialize: function() { - this.$el.html("