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

Little JS update + .gitignore

Browse Source
This commit is contained in:
Loic Blot 2016-05-18 22:20:13 +02:00
parent 1b2a171b89
commit 339f76cf01
3 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
.idea/*

3
appinfo/routes.php
View File

@ -38,4 +38,7 @@ $application->registerRoutes($this, array('routes' => array(
array('name' => 'api#fetch_messages', 'url' => '/api/v2/messages/{start}/{limit}', 'verb' => 'GET'), // Android APIv2 array('name' => 'api#fetch_messages', 'url' => '/api/v2/messages/{start}/{limit}', 'verb' => 'GET'), // Android APIv2
array('name' => 'api#fetch_messages_for_number', 'url' => '/api/v2/messages/{phonenumber}/{start}/{limit}', 'verb' => 'GET'), // Android APIv2 array('name' => 'api#fetch_messages_for_number', 'url' => '/api/v2/messages/{phonenumber}/{start}/{limit}', 'verb' => 'GET'), // Android APIv2
array('name' => 'api#fetch_messages_to_send', 'url' => '/api/v2/messages/sendqueue', 'verb' => 'GET'), // Android APIv2 array('name' => 'api#fetch_messages_to_send', 'url' => '/api/v2/messages/sendqueue', 'verb' => 'GET'), // Android APIv2
// API v3
// @TODO future calls to sending calls recorded on the phone
))); )));

30
js/public/app.js
View File

@ -20,7 +20,6 @@ var g_unreadCountNotifStep = 12;
var g_lastUnreadCountAllConv = 0; var g_lastUnreadCountAllConv = 0;
var g_originalTitle = document.title; var g_originalTitle = document.title;
var g_ulContactList = $('.contact-list');
var app = angular.module('OcSms', []); var app = angular.module('OcSms', []);
function inArray(val, arr) { function inArray(val, arr) {
@ -28,10 +27,9 @@ function inArray(val, arr) {
} }
function arrayUnique(arr) { function arrayUnique(arr) {
var unq = arr.filter(function(item, i, arr) { return arr.filter(function (item, i, arr) {
return i == arr.indexOf(item); return i == arr.indexOf(item);
}) });
return unq;
} }
app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile', app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile',
@ -133,7 +131,7 @@ app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile'
}, },
function(jsondata, status) { function(jsondata, status) {
var fmt = $scope.formatConversation(jsondata); var fmt = $scope.formatConversation(jsondata);
conversationBuf = fmt[1]; var conversationBuf = fmt[1];
if (conversationBuf == true) { if (conversationBuf == true) {
$('#app-content').scrollTop(1E10); $('#app-content').scrollTop(1E10);
// This will blink the tab because there is new messages // This will blink the tab because there is new messages
@ -179,7 +177,12 @@ app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile'
} }
if (!inArray(peerLabel, bufferedContacts)) { if (!inArray(peerLabel, bufferedContacts)) {
contactObj = {'label': peerLabel, 'nav': idxVal2, 'avatar': jsondata['photos'][peerLabel], 'unread': val}; var contactObj = {
'label': peerLabel,
'nav': idxVal2,
'avatar': jsondata['photos'][peerLabel],
'unread': val
};
$scope.removeContact(contactObj); $scope.removeContact(contactObj);
$scope.addContactToFront(contactObj); $scope.addContactToFront(contactObj);
@ -259,7 +262,7 @@ app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile'
return; return;
} }
} }
} };
/* /*
* Conversation messagelist management * Conversation messagelist management
@ -268,7 +271,8 @@ app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile'
$scope.$apply(function () { $scope.$apply(function () {
$scope.messages.push(msg); $scope.messages.push(msg);
}); });
} };
$scope.removeConversationMessage = function (msgId) { $scope.removeConversationMessage = function (msgId) {
var len = $scope.messages.length; var len = $scope.messages.length;
for (var i=0; i < len; i++) { for (var i=0; i < len; i++) {
@ -282,7 +286,7 @@ app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile'
return; return;
} }
} }
} };
$scope.fetchInitialSettings = function () { $scope.fetchInitialSettings = function () {
$.getJSON(OC.generateUrl('/apps/ocsms/get/settings'), function(jsondata, status) { $.getJSON(OC.generateUrl('/apps/ocsms/get/settings'), function(jsondata, status) {
@ -296,7 +300,8 @@ app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile'
$scope.setting_enableNotifications = jsondata["notification_state"]; $scope.setting_enableNotifications = jsondata["notification_state"];
} }
}); });
} };
$scope.fetchInitialPeerList = function (jsondata) { $scope.fetchInitialPeerList = function (jsondata) {
// Use a buffer for better jQuery performance // Use a buffer for better jQuery performance
var peerListBuf = ""; var peerListBuf = "";
@ -349,7 +354,6 @@ app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile'
// Improve JS performance // Improve JS performance
var msgClass = ''; var msgClass = '';
var msgCount = 0; var msgCount = 0;
var formatedDate = '';
$.each(jsondata["conversation"], function(id, vals) { $.each(jsondata["conversation"], function(id, vals) {
if (vals["type"] == 1) { if (vals["type"] == 1) {
@ -375,7 +379,7 @@ app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile'
}); });
return [msgCount,buf]; return [msgCount,buf];
} };
$scope.desktopNotify = function (msg) { $scope.desktopNotify = function (msg) {
if ($scope.setting_enableNotifications == 0) { if ($scope.setting_enableNotifications == 0) {
@ -398,7 +402,7 @@ app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile'
} }
}); });
} }
} };
$interval($scope.refreshConversation, 10000); $interval($scope.refreshConversation, 10000);
$interval($scope.checkNewMessages, 10000); $interval($scope.checkNewMessages, 10000);