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

Reorder JS files & add vue.js

Browse Source
This commit is contained in:
Loic Blot 2017-12-28 17:01:44 +01:00
parent 9a6d6907cf
commit c345b8ae64
No known key found for this signature in database
GPG Key ID: EFAA458E8C153987
4 changed files with 35 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
js/angular/angular.min.js → js/angular.min.js vendored
View File

52
js/public/app.js → js/app.js
View File

@ -20,12 +20,12 @@ var g_originalTitle = document.title;
var app = angular.module('OcSms', []); var app = angular.module('OcSms', []);
function inArray(val, arr) { function inArray(val, arr) {
return ($.inArray(val, arr) != -1); return ($.inArray(val, arr) !== -1);
} }
function arrayUnique(arr) { function arrayUnique(arr) {
return arr.filter(function (item, i, arr) { return arr.filter(function (item, i, arr) {
return i == arr.indexOf(item); return i === arr.indexOf(item);
}); });
} }
@ -53,7 +53,7 @@ app.directive('toInt', function() {
// Imported from contact app // Imported from contact app
app.filter('peerColor', function() { app.filter('peerColor', function() {
return function(input) { return function(input) {
if (typeof input == 'undefined') { if (typeof input === 'undefined') {
return ''; return '';
} }
// Check if core has the new color generator // Check if core has the new color generator
@ -73,7 +73,7 @@ app.filter('peerColor', function() {
app.filter('firstCharacter', function() { app.filter('firstCharacter', function() {
return function(input) { return function(input) {
if (input.charAt(0) == '+') { if (input.charAt(0) === '+') {
return '#'; return '#';
} }
@ -107,7 +107,7 @@ app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile'
$scope.generateUrl = function (endpoint) { $scope.generateUrl = function (endpoint) {
var winRegexp = /(.*)\/ocsms.*/; var winRegexp = /(.*)\/ocsms.*/;
var match = winRegexp.exec(window.location.href); var match = winRegexp.exec(window.location.href);
if (match.length != 2) { if (match.length !== 2) {
console.log("A very bad error happened when parsing window location"); console.log("A very bad error happened when parsing window location");
} }
return match[1] + '/ocsms' + endpoint; return match[1] + '/ocsms' + endpoint;
@ -167,7 +167,7 @@ app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile'
function(jsondata, status) { function(jsondata, status) {
var phoneNumberLabel = $scope.selectedContact.nav; var phoneNumberLabel = $scope.selectedContact.nav;
if (typeof jsondata['phoneNumbers'] != 'undefined') { if (typeof jsondata['phoneNumbers'] !== 'undefined') {
var phoneNumberList = arrayUnique(jsondata['phoneNumbers']); var phoneNumberList = arrayUnique(jsondata['phoneNumbers']);
phoneNumberLabel = phoneNumberList.toString(); phoneNumberLabel = phoneNumberList.toString();
} }
@ -176,7 +176,7 @@ app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile'
$scope.formatConversation(jsondata); $scope.formatConversation(jsondata);
$scope.$apply(function() { $scope.$apply(function() {
if (typeof jsondata['contactName'] == 'undefined' || jsondata['contactName'] == '') { if (typeof jsondata['contactName'] === 'undefined' || jsondata['contactName'] === '') {
$scope.selectedContact.label = phoneNumberLabel; $scope.selectedContact.label = phoneNumberLabel;
$scope.selectedContact.opt_numbers = ""; $scope.selectedContact.opt_numbers = "";
} }
@ -202,10 +202,10 @@ app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile'
function(jsondata, status) { function(jsondata, status) {
var fmt = $scope.formatConversation(jsondata); var fmt = $scope.formatConversation(jsondata);
var 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
if (document.hasFocus() == false) { if (document.hasFocus() === false) {
g_unreadCountCurrentConv += parseInt(fmt[0]); g_unreadCountCurrentConv += parseInt(fmt[0]);
document.title = g_originalTitle + " (" + g_unreadCountCurrentConv + ")"; document.title = g_originalTitle + " (" + g_unreadCountCurrentConv + ")";
$scope.desktopNotify(g_unreadCountCurrentConv + " unread message(s) in conversation with " + $scope.selectedContact.label); $scope.desktopNotify(g_unreadCountCurrentConv + " unread message(s) in conversation with " + $scope.selectedContact.label);
@ -226,7 +226,7 @@ app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile'
$.each(jsondata['phonelist'], function(id, val) { $.each(jsondata['phonelist'], function(id, val) {
var fn, peerLabel; var fn, peerLabel;
if (typeof jsondata['contacts'][id] == 'undefined') { if (typeof jsondata['contacts'][id] === 'undefined') {
peerLabel = id; peerLabel = id;
} }
else { else {
@ -241,11 +241,11 @@ app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile'
'unread': parseInt(val) 'unread': parseInt(val)
}; };
if (typeof jsondata['photos'][peerLabel] != 'undefined') { if (typeof jsondata['photos'][peerLabel] !== 'undefined') {
contactObj.avatar = jsondata['photos'][peerLabel]; contactObj.avatar = jsondata['photos'][peerLabel];
} }
if (typeof jsondata['uids'][peerLabel] != 'undefined') { if (typeof jsondata['uids'][peerLabel] !== 'undefined') {
contactObj.uid = jsondata['uids'][peerLabel]; contactObj.uid = jsondata['uids'][peerLabel];
} else { } else {
contactObj.uid = peerLabel; contactObj.uid = peerLabel;
@ -255,7 +255,7 @@ app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile'
bufferedContacts.push(peerLabel); bufferedContacts.push(peerLabel);
// Re-set conversation because we reload the element // Re-set conversation because we reload the element
if (id == $scope.selectedContact.nav) { if (id === $scope.selectedContact.nav) {
changeSelectedConversation($("a[mailbox-navigation='" + id + "']")); changeSelectedConversation($("a[mailbox-navigation='" + id + "']"));
} }
@ -278,7 +278,7 @@ app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile'
* We notify user every two minutes for all messages * We notify user every two minutes for all messages
* or if unreadCount changes * or if unreadCount changes
*/ */
if (g_unreadCountNotifStep == 0 || g_lastUnreadCountAllConv != g_unreadCountAllConv) { if (g_unreadCountNotifStep === 0 || g_lastUnreadCountAllConv !== g_unreadCountAllConv) {
$scope.desktopNotify(g_unreadCountAllConv + " unread message(s) for all conversations"); $scope.desktopNotify(g_unreadCountAllConv + " unread message(s) for all conversations");
g_unreadCountNotifStep = 12; g_unreadCountNotifStep = 12;
g_lastUnreadCountAllConv = g_unreadCountAllConv; g_lastUnreadCountAllConv = g_unreadCountAllConv;
@ -304,7 +304,7 @@ app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile'
}; };
$scope.filterSms = function (query) { $scope.filterSms = function (query) {
if (query != $scope.lastSearch) { if (query !== $scope.lastSearch) {
} }
}; };
@ -327,7 +327,7 @@ app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile'
var len = $scope.contacts.length; var len = $scope.contacts.length;
for (var i=0; i < len; i++) { for (var i=0; i < len; i++) {
var curCt = $scope.contacts[i]; var curCt = $scope.contacts[i];
if (curCt['nav'] == ct['nav']) { if (curCt['nav'] === ct['nav']) {
$scope.$apply(function () { $scope.$apply(function () {
$scope.contacts.splice(i, 1); $scope.contacts.splice(i, 1);
}); });
@ -339,10 +339,10 @@ app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile'
$scope.modifyContact = function (ct) { $scope.modifyContact = function (ct) {
var len = $scope.contacts.length; var len = $scope.contacts.length;
for (var i=0; i < len; i++) { for (var i=0; i < len; i++) {
if ($scope.contacts[i]['nav'] == ct['nav']) { if ($scope.contacts[i]['nav'] === ct['nav']) {
$scope.$apply(function () { $scope.$apply(function () {
$scope.contacts[i].unread = parseInt(ct.unread); $scope.contacts[i].unread = parseInt(ct.unread);
if (typeof(ct.avatar) != 'undefined') { if (typeof(ct.avatar) !== 'undefined') {
$scope.contacts[i].avatar = ct.avatar; $scope.contacts[i].avatar = ct.avatar;
} }
}); });
@ -363,7 +363,7 @@ app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile'
var len = $scope.messages.length; var len = $scope.messages.length;
for (var i=0; i < len; i++) { for (var i=0; i < len; i++) {
var curMsg = $scope.messages[i]; var curMsg = $scope.messages[i];
if (curMsg['id'] == msgId) { if (curMsg['id'] === msgId) {
$.post($scope.generateUrl('/delete/message'), $.post($scope.generateUrl('/delete/message'),
{"messageId": msgId, "phoneNumber": $scope.selectedContact.label}, function(data) { {"messageId": msgId, "phoneNumber": $scope.selectedContact.label}, function(data) {
$scope.$apply(function () { $scope.$apply(function () {
@ -377,7 +377,7 @@ app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile'
$scope.fetchInitialSettings = function () { $scope.fetchInitialSettings = function () {
$.getJSON($scope.generateUrl('/front-api/v1/settings'), function(jsondata, status) { $.getJSON($scope.generateUrl('/front-api/v1/settings'), function(jsondata, status) {
if (jsondata['status'] == true) { if (jsondata['status'] === true) {
$('#sel_intl_phone').val(jsondata["country"]); $('#sel_intl_phone').val(jsondata["country"]);
$('input[name=setting_msg_per_page]').val(parseInt(jsondata["message_limit"])); $('input[name=setting_msg_per_page]').val(parseInt(jsondata["message_limit"]));
@ -401,7 +401,7 @@ app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile'
$.each(jsondata['phonelist'], function(id, val) { $.each(jsondata['phonelist'], function(id, val) {
var peerLabel; var peerLabel;
if (typeof jsondata['contacts'][id] == 'undefined') { if (typeof jsondata['contacts'][id] === 'undefined') {
peerLabel = id; peerLabel = id;
} }
else { else {
@ -415,11 +415,11 @@ app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile'
'lastmsg': parseInt(val) 'lastmsg': parseInt(val)
}; };
if (typeof(jsondata['photos'][peerLabel]) != 'undefined') { if (typeof(jsondata['photos'][peerLabel]) !== 'undefined') {
contactObj['avatar'] = jsondata['photos'][peerLabel]; contactObj['avatar'] = jsondata['photos'][peerLabel];
} }
if (typeof jsondata['uids'][peerLabel] != 'undefined') { if (typeof jsondata['uids'][peerLabel] !== 'undefined') {
contactObj.uid = jsondata['uids'][peerLabel]; contactObj.uid = jsondata['uids'][peerLabel];
} else { } else {
contactObj.uid = peerLabel; contactObj.uid = peerLabel;
@ -459,10 +459,10 @@ app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile'
var msgCount = 0; var msgCount = 0;
$.each(jsondata["conversation"], function(id, vals) { $.each(jsondata["conversation"], function(id, vals) {
if (vals["type"] == 1) { if (vals["type"] === 1) {
msgClass = "recv"; msgClass = "recv";
} }
else if (vals["type"] == 2) { else if (vals["type"] === 2) {
msgClass = "sent"; msgClass = "sent";
} }
else { else {
@ -485,7 +485,7 @@ app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile'
}; };
$scope.desktopNotify = function (msg) { $scope.desktopNotify = function (msg) {
if ($scope.setting_enableNotifications == 0) { if ($scope.setting_enableNotifications === 0) {
return; return;
} }

6
js/vue.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

5
templates/main.php
View File

@ -1,8 +1,9 @@
<?php <?php
use \OCA\OcSms\Lib\CountryCodes; use \OCA\OcSms\Lib\CountryCodes;
\OCP\Util::addScript('ocsms', 'angular/angular.min'); \OCP\Util::addScript('ocsms', 'angular.min');
\OCP\Util::addScript('ocsms', 'public/app'); \OCP\Util::addScript('ocsms', 'app');
\OCP\Util::addScript('ocsms', 'vue.min');
\OCP\Util::addStyle('ocsms', 'style'); \OCP\Util::addStyle('ocsms', 'style');
?> ?>