colin/Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Supress change event on avatarUrl initialization

Browse Source
This commit is contained in:
lilia
2015-06-09 12:03:28 -07:00
parent ac401c78b3
commit 9795b26bc1
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
js/models/conversations.js
View File

@@ -222,7 +222,7 @@
} }
}, },
updateAvatarUrl: function() { updateAvatarUrl: function(silent) {
this.revokeAvatarUrl(); this.revokeAvatarUrl();
var avatar = this.get('avatar'); var avatar = this.get('avatar');
if (avatar) { if (avatar) {
@@ -232,12 +232,14 @@
} else { } else {
this.avatarUrl = null; this.avatarUrl = null;
} }
this.trigger('change'); if (!silent) {
this.trigger('change');
}
}, },
getAvatarUrl: function() { getAvatarUrl: function() {
if (this.avatarUrl === undefined) { if (this.avatarUrl === undefined) {
this.updateAvatarUrl(); this.updateAvatarUrl(true);
} }
return this.avatarUrl || '/images/default.png'; return this.avatarUrl || '/images/default.png';
}, },