From d119bdff01f36dc68448eee0bc4cb2b69027e6f8 Mon Sep 17 00:00:00 2001 From: lilia Date: Wed, 14 Jan 2015 01:37:41 -1000 Subject: [PATCH] restore default avatars --- js/models/conversations.js | 3 +-- js/views/conversation_list_item_view.js | 5 +++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/js/models/conversations.js b/js/models/conversations.js index 520deffa0..7aeb8b18c 100644 --- a/js/models/conversations.js +++ b/js/models/conversations.js @@ -24,7 +24,6 @@ defaults: function() { var timestamp = new Date().getTime(); return { - image : '/images/default.png', unreadCount : 0, timestamp : timestamp, active_at : timestamp @@ -36,7 +35,7 @@ }, validate: function(attributes, options) { - var required = ['type', 'timestamp', 'image']; + var required = ['type', 'timestamp']; var missing = _.filter(required, function(attr) { return !attributes[attr]; }); if (missing.length) { return "Conversation must have " + missing; } }, diff --git a/js/views/conversation_list_item_view.js b/js/views/conversation_list_item_view.js index 62b7cca17..d60e14092 100644 --- a/js/views/conversation_list_item_view.js +++ b/js/views/conversation_list_item_view.js @@ -41,6 +41,11 @@ var Whisper = Whisper || {}; new Whisper.AttachmentView({model: this.model.get('avatar')}).render().el ); } + else { + this.$el.find('.avatar').append( + $('').attr('src', '/images/default.png') + ); + } return this; }