Browse Source

Used contact pic from db.

pull/52/head
Evan Theurer 11 years ago
parent
commit
930ab09391
  1. 7
      static/js/services/buddylist.js

7
static/js/services/buddylist.js

@ -455,7 +455,7 @@ define(['underscore', 'modernizr', 'avltree', 'text!partials/buddy.html', 'text!
var contact = scope.contact && scope.contact.Status; var contact = scope.contact && scope.contact.Status;
// Update display name. // Update display name.
var displayName = display.displayName; var displayName = display.displayName;
if(contact) { if (contact) {
display.displayName = contact.displayName; display.displayName = contact.displayName;
} else if (status.displayName) { } else if (status.displayName) {
display.displayName = status.displayName; display.displayName = status.displayName;
@ -472,7 +472,10 @@ define(['underscore', 'modernizr', 'avltree', 'text!partials/buddy.html', 'text!
this.updateSubline(display, status.message); this.updateSubline(display, status.message);
} }
// Update display picture. // Update display picture.
if (status.buddyPicture) { if (contact) {
display.buddyPicture = contact.buddyPicture || null;
this.updateBuddyPicture(display);
} else if (status.buddyPicture) {
display.buddyPicture = status.buddyPicture || null; display.buddyPicture = status.buddyPicture || null;
this.updateBuddyPicture(display); this.updateBuddyPicture(display);
} }

Loading…
Cancel
Save