flywithu/ocsms
1
0
Fork 0
mirror of https://github.com/nextcloud/ocsms.git synced 2026-08-21 13:23:04 +00:00
Code Issues Releases Wiki Activity

Finish to drop Angular.JS

Browse Source
This commit is contained in:
Loic Blot
2018-09-08 00:04:26 +02:00
committed by Loïc Blot
parent 5bbb1292c8
commit 42a3c1ea61
5 changed files with 81 additions and 452 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/devel/app.js
-3
View File
@@ -12,11 +12,8 @@ var Sms = {
// Attributes
selectedConversation: null,
unreadCountCurrentConv: 0,
unreadCountAllConv: 0,
unreadCountNotifStep: 12,
lastUnreadCountAllConv: 0,
lastContactListMsgDate: 0,
lastMessageDate: 0,
originalTitle: document.title,
photoVersion: 1,
js/devel/contactlist.js
+81 -3
View File
@@ -12,11 +12,16 @@ var ContactList = new Vue({
el: '#app-mailbox-peers',
data: {
isContactsLoading: true,
contacts: []
contacts: [],
lastRetrievedMessageDate: 0,
totalUnreadMessages: 0,
lastTotalUnreadCount: 0
},
created: function () {
this.contacts = [];
this.fetch();
this.checkNewMessages();
setInterval(this.checkNewMessages, 10000);
},
methods: {
fetch: function () {
@@ -61,7 +66,7 @@ var ContactList = new Vue({
self.isContactsLoading = false;
Sms.lastContactListMsgDate = jsondata["lastRead"];
Sms.lastMessageDate = jsondata["lastMessage"];
self.lastRetrievedMessageDate = jsondata["lastMessage"];
var pnParam = $.urlParam('phonenumber');
if (pnParam != null) {
@@ -126,7 +131,80 @@ var ContactList = new Vue({
}
}
}
}
},
checkNewMessages: function () {
this.totalUnreadMessages = 0;
var self = this;
$.getJSON(Sms.generateURL('/front-api/v1/new_messages'),
{'lastDate': this.lastRetrievedMessageDate},
function (jsondata, status) {
var bufferedContacts = [];
$.each(jsondata['phonelist'], function (id, val) {
console.log(id);
console.log(val);
var fn, peerLabel;
if (typeof jsondata['contacts'][id] === 'undefined') {
peerLabel = id;
}
else {
fn = jsondata['contacts'][id];
peerLabel = fn;
}
if (!inArray(peerLabel, bufferedContacts)) {
var contactObj = {
'label': peerLabel,
'nav': id,
'unread': parseInt(val)
};
if (typeof jsondata['photos'][peerLabel] !== 'undefined') {
contactObj.avatar = jsondata['photos'][peerLabel];
}
if (typeof jsondata['uids'][peerLabel] !== 'undefined') {
contactObj.uid = jsondata['uids'][peerLabel];
} else {
contactObj.uid = peerLabel;
}
ContactList.modifyContact(contactObj);
bufferedContacts.push(peerLabel);
// Re-set conversation because we reload the element
if (id === Conversation.selectedContact.nav) {
Sms.selectConversation($("a[mailbox-navigation='" + id + "']"));
}
self.totalUnreadMessages += parseInt(val);
}
});
/*
* Decrement notification step counter, but stop it a zero
* Stop at zero permit to notify instanly the user when
* there is new messages in all conversations
*/
if (Sms.unreadCountNotifStep > 0) {
Sms.unreadCountNotifStep--;
}
if (self.totalUnreadMessages > 0) {
/*
* We notify user every two minutes for all messages
* or if unreadCount changes
*/
if (Sms.unreadCountNotifStep === 0 || self.lastTotalUnreadCount !== self.totalUnreadMessages) {
SmsNotifications.notify(self.totalUnreadMessages + " unread message(s) for all conversations");
Sms.unreadCountNotifStep = 12;
self.lastTotalUnreadCount = self.totalUnreadMessages;
}
}
}
);
},
},
computed: {
orderedContacts: function () {
js/devel/legacy.js
-115
View File
@@ -1,115 +0,0 @@
/**
* Nextcloud - Phone Sync
*
* This file is licensed under the Affero General Public License version 3 or
* later. See the COPYING file.
*
* @author Loic Blot <loic.blot@unix-experience.fr>
* @copyright Loic Blot 2014-2018
*/
var app = angular.module('OcSms', []);
app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile',
function ($scope, $interval, $timeout, $compile) {
$scope.buttons = [
{text: "Send"}
];
$scope.lastSearch = '';
$scope.checkNewMessages = function () {
Sms.unreadCountAllConv = 0;
$.getJSON(Sms.generateURL('/front-api/v1/new_messages'),
{'lastDate': Sms.lastMessageDate},
function (jsondata, status) {
var bufferedContacts = [];
$.each(jsondata['phonelist'], function (id, val) {
var fn, peerLabel;
if (typeof jsondata['contacts'][id] === 'undefined') {
peerLabel = id;
}
else {
fn = jsondata['contacts'][id];
peerLabel = fn;
}
if (!inArray(peerLabel, bufferedContacts)) {
var contactObj = {
'label': peerLabel,
'nav': id,
'unread': parseInt(val)
};
if (typeof jsondata['photos'][peerLabel] !== 'undefined') {
contactObj.avatar = jsondata['photos'][peerLabel];
}
if (typeof jsondata['uids'][peerLabel] !== 'undefined') {
contactObj.uid = jsondata['uids'][peerLabel];
} else {
contactObj.uid = peerLabel;
}
ContactList.modifyContact(contactObj);
bufferedContacts.push(peerLabel);
// Re-set conversation because we reload the element
if (id === Conversation.selectedContact.nav) {
Sms.selectConversation($("a[mailbox-navigation='" + id + "']"));
}
Sms.unreadCountAllConv += parseInt(val);
}
});
/*
* Decrement notification step counter, but stop it a zero
* Stop at zero permit to notify instanly the user when
* there is new messages in all conversations
*/
if (Sms.unreadCountNotifStep > 0) {
Sms.unreadCountNotifStep--;
}
if (Sms.unreadCountAllConv > 0) {
/*
* We notify user every two minutes for all messages
* or if unreadCount changes
*/
if (Sms.unreadCountNotifStep === 0 || Sms.lastUnreadCountAllConv !== Sms.unreadCountAllConv) {
SmsNotifications.notify(Sms.unreadCountAllConv + " unread message(s) for all conversations");
Sms.unreadCountNotifStep = 12;
Sms.lastUnreadCountAllConv = Sms.unreadCountAllConv;
}
}
}
);
};
$scope.filterSms = function (query) {
if (query !== $scope.lastSearch) {
}
};
OC.Plugins.register('OCA.Search', {
attach: function (search) {
search.setFilter('sms', $scope.filterSms);
}
});
$interval($scope.checkNewMessages, 10000);
$timeout(function () {
// Register real title
Sms.originalTitle = document.title;
SmsNotifications.init();
$scope.checkNewMessages();
});
}
]);