mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Reorder functions

Browse source 
// FREEBIE
This commit is contained in:
lilia 2015-09-22 15:52:33 -07:00
parent 62c90e3925
commit 213dbdefd2
1 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
js/models/conversations.js
View file

@ -232,17 +232,6 @@
} }
}, },
getNotificationIcon: function() {
return new Promise(function(resolve) {
var avatar = this.getAvatar();
if (avatar.url) {
resolve(avatar.url);
} else {
resolve(new Whisper.IdenticonSVGView(avatar).getDataUrl());
}
}.bind(this));
},
updateAvatarUrl: function(silent) { updateAvatarUrl: function(silent) {
this.revokeAvatarUrl(); this.revokeAvatarUrl();
var avatar = this.get('avatar'); var avatar = this.get('avatar');
@ -279,6 +268,17 @@
} }
}, },
getNotificationIcon: function() {
return new Promise(function(resolve) {
var avatar = this.getAvatar();
if (avatar.url) {
resolve(avatar.url);
} else {
resolve(new Whisper.IdenticonSVGView(avatar).getDataUrl());
}
}.bind(this));
},
resolveConflicts: function(conflict) { resolveConflicts: function(conflict) {
var number = conflict.number; var number = conflict.number;
var identityKey = conflict.identityKey; var identityKey = conflict.identityKey;