flywithu/ocsms
1
0
Fork 0
mirror of https://github.com/nerzhul/ocsms.git synced 2025-06-09 08:56:10 +00:00
Code Issues Releases Wiki Activity

Cleanup a little bit avatar management

Browse Source
This commit is contained in:
Loic Blot 2016-09-19 21:31:43 +02:00
parent ce967126d0
commit 6c37d0ccfe
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
js/public/app.js
View File

@ -184,10 +184,13 @@ app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile'
var contactObj = { var contactObj = {
'label': peerLabel, 'label': peerLabel,
'nav': idxVal2, 'nav': idxVal2,
'avatar': jsondata['photos'][peerLabel],
'unread': val 'unread': val
}; };
if (typeof jsondata['photos'][peerLabel] != 'undefined') {
contactObj.avatar = jsondata['photos'][peerLabel];
}
$scope.modifyContact(contactObj); $scope.modifyContact(contactObj);
bufferedContacts.push(peerLabel); bufferedContacts.push(peerLabel);
@ -230,7 +233,7 @@ app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile'
// Reinit main window // Reinit main window
$scope.selectedContact.label = ""; $scope.selectedContact.label = "";
$scope.selectedContact.opt_numbers = ""; $scope.selectedContact.opt_numbers = "";
$scope.selectedContact.avatar = ""; $scope.selectedContact.avatar = undefined;
$scope.removeContact($scope.selectedContact); $scope.removeContact($scope.selectedContact);
$scope.$apply(function () { $scope.$apply(function () {
$scope.messages = []; $scope.messages = [];
@ -268,7 +271,9 @@ app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile'
if ($scope.contacts[i]['nav'] == ct['nav']) { if ($scope.contacts[i]['nav'] == ct['nav']) {
$scope.apply(function () { $scope.apply(function () {
$scope.contacts[i].unread = ct.unread; $scope.contacts[i].unread = ct.unread;
$scope.contacts[i].avatar = ct.avatar; if (typeof(ct.avatar) != 'undefined') {
$scope.contacts[i].avatar = ct.avatar;
}
}); });
} }
} }
@ -334,7 +339,17 @@ app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile'
peerLabel = jsondata['contacts'][id]; peerLabel = jsondata['contacts'][id];
} }
if (!inArray(peerLabel, bufferedContacts)) { if (!inArray(peerLabel, bufferedContacts)) {
$scope.addContact({'label': peerLabel, 'nav': idxVal2, 'avatar': photoPrefix + jsondata['photos'][peerLabel], 'unread' : 0, 'lastmsg': val}); var contactObj = {
'label': peerLabel,
'nav': idxVal2,
'unread' : 0,
'lastmsg': val
};
if (typeof(jsondata['photos'][peerLabel]) != 'undefined') {
contactObj['avatar'] = photoPrefix + jsondata['photos'][peerLabel];
}
$scope.addContact(contactObj);
bufferedContacts.push(peerLabel); bufferedContacts.push(peerLabel);
} }
}); });