1
0
mirror of https://github.com/nextcloud/ocsms.git synced 2026-08-22 05:43:07 +00:00

v1.6.2: Fix owncloud 9 contact app which break our frontend

This commit is contained in:
Loic Blot
2016-03-08 22:51:00 +01:00
parent 2990a5cbad
commit 3d71229767
4 changed files with 28 additions and 4 deletions
+8 -1
View File
@@ -46,6 +46,7 @@ app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile'
$scope.contacts = [];
$scope.messages = [];
$scope.totalMessageCount = 0;
$scope.photoVersion = 1;
// Settings
$scope.sendCountry = function () {
$.post(OC.generateUrl('/apps/ocsms/set/country'),{'country': $('select[name=intl_phone]').val()});
@@ -299,8 +300,14 @@ app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile'
$scope.fetchInitialPeerList = function (jsondata) {
// Use a buffer for better jQuery performance
var peerListBuf = "";
var photoPrefix = "";
var bufferedContacts = [];
$scope.photoVersion = jsondata["photo_version"];
if ($scope.photoVersion >= 2) {
photoPrefix = "data:image/png;base64,";
}
$.each(jsondata['phonelist'], function(id, val) {
var fn, peerLabel, idxVal;
idxVal = id.replace(/\//g,' ');
@@ -314,7 +321,7 @@ app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile'
peerLabel = fn;
}
if (!inArray(peerLabel, bufferedContacts)) {
$scope.addContact({'label': peerLabel, 'nav': idxVal2, 'avatar': jsondata['photos'][peerLabel], 'unread' : 0});
$scope.addContact({'label': peerLabel, 'nav': idxVal2, 'avatar': photoPrefix + jsondata['photos'][peerLabel], 'unread' : 0});
bufferedContacts.push(peerLabel);
}
});