oxen-io/session-desktop
1
0
Fork 0
mirror of https://github.com/oxen-io/session-desktop.git synced 2023-12-14 02:12:57 +01:00
Code Issues Projects Releases Wiki Activity

MessageView: Handle change of color to null, call getColor() (#1438)

Browse source 
When we relied on the actual value of the color property to be supplied
to the updateColor change event listener, sometimes it would be null.
Then the conversation bubbles would have no color at all, making the
text hard to read.

FREEBIE
This commit is contained in:
Scott Nonnenberg 2017-09-06 18:19:11 -07:00 committed by GitHub
parent 4cba16cb61
commit 4009a0119e
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
js/views/message_view.js
View file

@ -365,15 +365,18 @@
return this;
},
updateColor: function(model, color) {
updateColor: function() {
var bubble = this.$('.bubble');
bubble.removeClass(Whisper.Conversation.COLORS);
// this.contact is known to be non-null if we're registered for color changes
var color = this.contact.getColor();
if (color) {
bubble.removeClass(Whisper.Conversation.COLORS);
bubble.addClass(color);
}
this.avatarView = new (Whisper.View.extend({
templateName: 'avatar',
render_attributes: { avatar: model.getAvatar() }
render_attributes: { avatar: this.model.getAvatar() }
}))();
this.$('.avatar').replaceWith(this.avatarView.render().$('.avatar'));
},