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

Drop dead code & move some code outside of legacy.js to app.js

Browse Source
This commit is contained in:
Loic Blot 2018-09-07 00:05:25 +02:00 committed by Loïc Blot
parent 364bd12be6
commit 80c4c2e3c2
2 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
js/devel/app.js
View File

@ -77,3 +77,21 @@ var ContactRenderer = {
}; };
Vue.filter('firstCharacter', ContactRenderer.generateFirstCharacter); Vue.filter('firstCharacter', ContactRenderer.generateFirstCharacter);
$.urlParam = function (name) {
var results = new RegExp('[\?&]' + name + '=([^&#]*)').exec(window.location.href);
if (results == null) {
return null;
}
else {
return results[1] || 0;
}
};
(function ($, OC) {
// reset count and title
window.onfocus = function () {
Sms.unreadCountCurrentConv = 0;
document.title = Sms.originalTitle;
};
})(jQuery, OC);

28
js/devel/legacy.js
View File

@ -12,21 +12,18 @@ var app = angular.module('OcSms', []);
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.buttons = [ $scope.buttons = [
{text: "Send"} {text: "Send"}
]; ];
$scope.messages = [];
$scope.totalMessageCount = 0; $scope.totalMessageCount = 0;
$scope.selectedContact = {};
$scope.lastSearch = ''; $scope.lastSearch = '';
$scope.refreshConversation = function () { $scope.refreshConversation = function () {
$.getJSON(Sms.generateURL('/ocsms/front-api/v1/conversation'), $.getJSON(Sms.generateURL('/ocsms/front-api/v1/conversation'),
{ {
'phoneNumber': $scope.selectedContact.nav, 'phoneNumber': Conversation.selectedContact.nav,
"lastDate": $scope.lastConvMessageDate "lastDate": Conversation.lastConvMessageDate
}, },
function (jsondata, status) { function (jsondata, status) {
var fmt = $scope.formatConversation(jsondata); var fmt = $scope.formatConversation(jsondata);
@ -37,7 +34,7 @@ app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile'
if (document.hasFocus() === false) { if (document.hasFocus() === false) {
Sms.unreadCountCurrentConv += parseInt(fmt[0]); Sms.unreadCountCurrentConv += parseInt(fmt[0]);
document.title = Sms.originalTitle + " (" + Sms.unreadCountCurrentConv + ")"; document.title = Sms.originalTitle + " (" + Sms.unreadCountCurrentConv + ")";
SmsNotifications.notify(Sms.unreadCountCurrentConv + " unread message(s) in conversation with " + $scope.selectedContact.label); SmsNotifications.notify(Sms.unreadCountCurrentConv + " unread message(s) in conversation with " + Conversation.selectedContact.label);
} }
} }
@ -84,7 +81,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 === Conversation.selectedContact.nav) {
Sms.selectConversation($("a[mailbox-navigation='" + id + "']")); Sms.selectConversation($("a[mailbox-navigation='" + id + "']"));
} }
@ -142,21 +139,4 @@ app.controller('OcSmsController', ['$scope', '$interval', '$timeout', '$compile'
} }
]); ]);
$.urlParam = function (name) {
var results = new RegExp('[\?&]' + name + '=([^&#]*)').exec(window.location.href);
if (results == null) {
return null;
}
else {
return results[1] || 0;
}
};
(function ($, OC) {
// reset count and title
window.onfocus = function () {
Sms.unreadCountCurrentConv = 0;
document.title = Sms.originalTitle;
};
})(jQuery, OC);