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

Cleanup one global variable for message count and split it in two distinct parts

Browse Source
This commit is contained in:
Loic Blot 2016-11-11 10:17:35 +01:00
parent fda6f1a68c
commit 42dbd2c3bf
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
js/public/app.js
View File

@ -11,7 +11,6 @@
// Some global vars to improve performances // Some global vars to improve performances
var g_selectedConversation = null; var g_selectedConversation = null;
var g_lastMsgDate = 0;
var g_unreadCountCurrentConv = 0; var g_unreadCountCurrentConv = 0;
var g_unreadCountAllConv = 0; var g_unreadCountAllConv = 0;
var g_unreadCountNotifStep = 12; var g_unreadCountNotifStep = 12;
@ -85,6 +84,8 @@ app.filter('firstCharacter', function() {
app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile', app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile',
function ($scope, $interval, $timeout, $compile) { function ($scope, $interval, $timeout, $compile) {
$scope.lastConvMessageDate = 0;
$scope.lastContactListMsgDate = 0;
$scope.isConvLoading = true; $scope.isConvLoading = true;
$scope.isContactsLoading = true; $scope.isContactsLoading = true;
$scope.buttons = [ $scope.buttons = [
@ -150,7 +151,7 @@ app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile'
} }
$scope.messages = []; $scope.messages = [];
g_lastMsgDate = 0; $scope.lastConvMessageDate = 0;
$.getJSON(OC.generateUrl('/apps/ocsms/get/conversation'), {'phoneNumber': $scope.selectedContact.nav}, $.getJSON(OC.generateUrl('/apps/ocsms/get/conversation'), {'phoneNumber': $scope.selectedContact.nav},
function(jsondata, status) { function(jsondata, status) {
@ -186,7 +187,7 @@ app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile'
$.getJSON(OC.generateUrl('/apps/ocsms/get/conversation'), $.getJSON(OC.generateUrl('/apps/ocsms/get/conversation'),
{ {
'phoneNumber': $scope.selectedContact.nav, 'phoneNumber': $scope.selectedContact.nav,
"lastDate": g_lastMsgDate "lastDate": $scope.lastConvMessageDate
}, },
function(jsondata, status) { function(jsondata, status) {
var fmt = $scope.formatConversation(jsondata); var fmt = $scope.formatConversation(jsondata);
@ -209,7 +210,7 @@ app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile'
$scope.checkNewMessages = function() { $scope.checkNewMessages = function() {
g_unreadCountAllConv = 0; g_unreadCountAllConv = 0;
$.getJSON(OC.generateUrl('/apps/ocsms/get/new_messages'), $.getJSON(OC.generateUrl('/apps/ocsms/get/new_messages'),
{ 'lastDate': g_lastMsgDate }, { 'lastDate': $scope.lastContactListMsgDate },
function(jsondata, status) { function(jsondata, status) {
var bufferedContacts = []; var bufferedContacts = [];
@ -399,7 +400,7 @@ app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile'
$scope.isContactsLoading = false; $scope.isContactsLoading = false;
}); });
g_lastMsgDate = jsondata["lastRead"]; $scope.lastContactListMsgDate = jsondata["lastRead"];
}; };
@ -436,8 +437,8 @@ app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile'
// Store the greater msg date for refresher // Store the greater msg date for refresher
// Note: we divide by 100 because number compare too large integers // Note: we divide by 100 because number compare too large integers
if ((id/100) > (g_lastMsgDate/100)) { if ((id/100) > ($scope.lastConvMessageDate/100)) {
g_lastMsgDate = id; $scope.lastConvMessageDate = id;
// Multiplicate ID to permit date to use it properly // Multiplicate ID to permit date to use it properly
$scope.addConversationMessage({'id': id, 'type': msgClass, 'date': new Date(id * 1), 'content': vals['msg']}); $scope.addConversationMessage({'id': id, 'type': msgClass, 'date': new Date(id * 1), 'content': vals['msg']});