flywithu/ocsms
1
0
Fork 0
mirror of https://github.com/nerzhul/ocsms.git synced 2025-10-31 02:17:38 +00:00
Code Issues Releases Wiki Activity

Load the ContactList in the ContactList object

Browse Source
This commit is contained in:
Loic Blot 2018-09-06 21:01:03 +02:00 committed by Loïc Blot
parent b387333ee8
commit 7da623e334
2 changed files with 61 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
js/devel/contactlist.js
View File

@ -15,7 +15,37 @@ var ContactList = new Vue({
contacts: [] contacts: []
}, },
created: function () { created: function () {
this.contacts = [];
var self = this;
// Now bind the events when we click on the phone number
$.getJSON(Sms.generateURL('/front-api/v1/peerlist'), function (jsondata, status) {
app.fetchInitialPeerList(jsondata);
var pnParam = $.urlParam('phonenumber');
if (pnParam != null) {
var urlPhoneNumber = decodeURIComponent(pnParam);
if (urlPhoneNumber != null) {
// If no contact when loading, creating a new contact from urlPhoneNumber
if (app.selectedContact.nav === undefined) {
app.selectedContact.label = urlPhoneNumber;
app.selectedContact.nav = urlPhoneNumber;
app.selectedContact.avatar = undefined;
// Now let's loop through the contact list and see if we can find the rest of the details
for (var i = 0; i < $scope.contacts.length; i++) {
if (self.contacts[i].nav === urlPhoneNumber) {
app.selectedContact = self.contacts[i];
break;
}
}
}
app.fetchConversation(app.selectedContact);
Sms.selectConversation($("a[mailbox-navigation='" + urlPhoneNumber + "']"));
}
}
});
}, },
methods: { methods: {
// Conversations // Conversations
@ -27,6 +57,33 @@ var ContactList = new Vue({
app.fetchConversation(contact); app.fetchConversation(contact);
Sms.selectConversation($("a[mailbox-navigation='" + contact.nav + "']")); Sms.selectConversation($("a[mailbox-navigation='" + contact.nav + "']"));
} }
},
/*
* Contact list management
*/
addContact: function (ct) {
this.contacts.push(ct);
},
removeContact: function (ct) {
var len = this.contacts.length;
for (var i = 0; i < len; i++) {
var curCt = this.contacts[i];
if (curCt['nav'] === ct['nav']) {
this.contacts.splice(i, 1);
return;
}
}
},
modifyContact: function (ct) {
var len = this.contacts.length;
for (var i = 0; i < len; i++) {
if (this.contacts[i]['nav'] === ct['nav']) {
this.contacts[i].unread = parseInt(ct.unread);
if (typeof(ct.avatar) !== 'undefined') {
this.contacts[i].avatar = ct.avatar;
}
}
}
} }
}, },
computed: { computed: {

71
js/devel/legacy.js
View File

@ -133,7 +133,7 @@ app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile'
contactObj.uid = peerLabel; contactObj.uid = peerLabel;
} }
$scope.modifyContact(contactObj); ContactList.modifyContact(contactObj);
bufferedContacts.push(peerLabel); bufferedContacts.push(peerLabel);
// Re-set conversation because we reload the element // Re-set conversation because we reload the element
@ -176,7 +176,7 @@ app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile'
$scope.selectedContact.label = ""; $scope.selectedContact.label = "";
$scope.selectedContact.opt_numbers = ""; $scope.selectedContact.opt_numbers = "";
$scope.selectedContact.avatar = undefined; $scope.selectedContact.avatar = undefined;
$scope.removeContact($scope.selectedContact); ContactList.removeContact($scope.selectedContact);
$scope.$apply(function () { $scope.$apply(function () {
$scope.messages = []; $scope.messages = [];
}); });
@ -196,49 +196,13 @@ app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile'
} }
}); });
/*
* Contact list management
*/
$scope.addContact = function (ct) {
$scope.$apply(function () {
$scope.contacts.push(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.$apply(function () {
$scope.contacts.splice(i, 1);
});
return;
}
}
};
$scope.modifyContact = function (ct) {
var len = $scope.contacts.length;
for (var i = 0; i < len; i++) {
if ($scope.contacts[i]['nav'] === ct['nav']) {
$scope.$apply(function () {
$scope.contacts[i].unread = parseInt(ct.unread);
if (typeof(ct.avatar) !== 'undefined') {
$scope.contacts[i].avatar = ct.avatar;
}
});
}
}
};
$scope.getContactOrderBy = function(ct) { $scope.getContactOrderBy = function(ct) {
return SmsSettings.data.contactOrderBy; return SmsSettings.data.contactOrderBy;
}; };
$scope.getReverseContactOrder = function(ct) { $scope.getReverseContactOrder = function(ct) {
return SmsSettings.data.reverseContactOrder; return SmsSettings.data.reverseContactOrder;
} };
/* /*
* Conversation messagelist management * Conversation messagelist management
@ -297,7 +261,7 @@ app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile'
contactObj.uid = peerLabel; contactObj.uid = peerLabel;
} }
$scope.addContact(contactObj); ContactList.addContact(contactObj);
bufferedContacts.push(peerLabel); bufferedContacts.push(peerLabel);
} }
}); });
@ -356,33 +320,6 @@ app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile'
// Register real title // Register real title
Sms.originalTitle = document.title; Sms.originalTitle = document.title;
// Now bind the events when we click on the phone number
$.getJSON(Sms.generateURL('/front-api/v1/peerlist'), function (jsondata, status) {
$scope.fetchInitialPeerList(jsondata);
var pnParam = $.urlParam('phonenumber');
if (pnParam != null) {
var urlPhoneNumber = decodeURIComponent(pnParam);
if (urlPhoneNumber != null) {
// If no contact when loading, creating a new contact from urlPhoneNumber
if ($scope.selectedContact.nav === undefined) {
$scope.selectedContact.label = urlPhoneNumber;
$scope.selectedContact.nav = urlPhoneNumber;
$scope.selectedContact.avatar = undefined;
// Now let's loop through the contact list and see if we can find the rest of the details
for (var i = 0; i < $scope.contacts.length; i++) {
if ($scope.contacts[i].nav == urlPhoneNumber) {
$scope.selectedContact = $scope.contacts[i];
break;
}
}
}
$scope.fetchConversation($scope.selectedContact);
Sms.selectConversation($("a[mailbox-navigation='" + urlPhoneNumber + "']"));
}
}
});
SmsNotifications.init(); SmsNotifications.init();
$scope.checkNewMessages(); $scope.checkNewMessages();
$scope.refreshConversation(); $scope.refreshConversation();