flywithu/ocsms
1
0
Fork 0
mirror of https://github.com/nerzhul/ocsms.git synced 2025-07-24 02:15:46 +00:00
Code Issues Releases Wiki Activity

Use angularJS to manage contact list update properly. This also fix a recent upstream bug which doesn't re-insert contact into contactlist when new messages arrived

Browse Source
This commit is contained in:
Loic Blot 2015-06-25 20:36:38 +00:00
parent 29a7f9e972
commit 3402bd9836
2 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
js/public/app.js
View File

@ -117,15 +117,11 @@ app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile'
} }
if (!inArray(peerLabel, bufferedContacts)) { if (!inArray(peerLabel, bufferedContacts)) {
$("li[peer-label='" + peerLabel + "']").remove(); contactObj = {'label': peerLabel, 'nav': idxVal2, 'avatar': jsondata['photos'][peerLabel], 'unread': val};
peerListBuf = '<li peer-label="' + peerLabel + '"><div class="ocsms-plavatar"';
if (typeof jsondata['photos'][peerLabel] != 'undefined') { $scope.removeContact(contactObj);
peerListBuf += 'style="background-image: url(' + jsondata['photos'][peerLabel] + ');"'; $scope.addContactToFront(contactObj);
}
peerListBuf += '></div><a href="#" ng-click="loadConversation(' + idxVal2 + ');" mailbox-navigation="' +
idxVal2 + '" style="font-weight: bold;" mailbox-label="' + peerLabel + '">' + peerLabel + ' (' + val + ')</a></li>';
g_ulContactList.prepend(peerListBuf);
bufferedContacts.push(peerLabel); bufferedContacts.push(peerLabel);
// Re-set conversation because we reload the element // Re-set conversation because we reload the element
@ -134,20 +130,6 @@ app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile'
} }
g_unreadCountAllConv += parseInt(val); g_unreadCountAllConv += parseInt(val);
// Now bind the events when we click on the phone number
$("a[mailbox-navigation='" + idxVal + "']").on('click', function (event) {
var phoneNumber = $(this).attr('mailbox-navigation');
OC.Util.History.pushState('phonenumber=' + phoneNumber);
// phoneNumber must exist
if (phoneNumber != null) {
$scope.fetchConversation(phoneNumber);
g_unreadCountAllConv += val;
changeSelectedConversation($(this));
}
event.preventDefault();
});
} }
}); });
@ -197,6 +179,21 @@ app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile'
$scope.contacts.push(ct); $scope.contacts.push(ct);
}); });
}; };
$scope.addContactToFront = function (ct) {
$scope.$apply(function () {
$scope.contacts.splice(0, 0, ct);
});
};
$scope.removeContact = function (ct) {
var len = $scope.contacts.length;
for (var i=0; i < len; i++) {
var curCt = $scope.contacts[i];
if (curCt['nav'] == ct['nav']) {
$scope.contacts.splice(i, 1);
return;
}
}
}
$scope.fetchInitialSettings = function () { $scope.fetchInitialSettings = function () {
$.getJSON(OC.generateUrl('/apps/ocsms/get/country'), function(jsondata, status) { $.getJSON(OC.generateUrl('/apps/ocsms/get/country'), function(jsondata, status) {
@ -223,7 +220,7 @@ app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile'
peerLabel = fn; peerLabel = fn;
} }
if (!inArray(peerLabel, bufferedContacts)) { if (!inArray(peerLabel, bufferedContacts)) {
$scope.addContact({'label': peerLabel, 'nav': idxVal2, 'avatar': jsondata['photos'][peerLabel]}); $scope.addContact({'label': peerLabel, 'nav': idxVal2, 'avatar': jsondata['photos'][peerLabel], 'unread' : 0});
bufferedContacts.push(peerLabel); bufferedContacts.push(peerLabel);
} }
}); });

2
templates/main.php
View File

@ -11,7 +11,7 @@ use \OCA\OcSms\Lib\CountryCodes;
<ul class="contact-list"> <ul class="contact-list">
<li ng-repeat="contact in contacts" peer-label="{{ contact.label }}"> <li ng-repeat="contact in contacts" peer-label="{{ contact.label }}">
<div class="ocsms-plavatar" style="background-image: url('{{ contact.avatar }}');"></div> <div class="ocsms-plavatar" style="background-image: url('{{ contact.avatar }}');"></div>
<a mailbox-label="{{ contact.label }}" mailbox-navigation="{{ contact.nav }}" ng-click="loadConversation(contact);" href="#">{{ contact.label }}</a> <a style="{{ contact.unread > 0 ? 'font-weight:bold;' : ''}}" mailbox-label="{{ contact.label }}" mailbox-navigation="{{ contact.nav }}" ng-click="loadConversation(contact);" href="#">{{ contact.label }}{{ contact.unread > 0 ? ' (' + contact.unread + ') ' : '' }}</a>
</li> </li>
</ul> </ul>
</div> </div>