martin/SODashServer
1
0
Fork 0
mirror of https://gitlab.silvrtree.co.uk/martind2000/SODashServer.git synced 2025-02-11 04:29:18 +00:00
Code Issues Projects Releases Wiki Activity

Apple Push notifications. Trying something else. again

Browse Source
This commit is contained in:
Martin Donnelly 2016-05-06 11:02:14 +01:00
parent ad5335e66c
commit 9de93973ae
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/js/appv2.js
View File

@ -21,6 +21,9 @@ var SOController = (function() {
badge: true, sound: true, alert: true, badge: true, sound: true, alert: true,
}; };
var calendarData;
var extendTimer;
var lightsList = { var lightsList = {
off: ['frontLightOff', 'backLightOff'], on: ['frontLightOn', 'backLightOn'] off: ['frontLightOff', 'backLightOff'], on: ['frontLightOn', 'backLightOn']
}; };
@ -89,6 +92,8 @@ var SOController = (function() {
function updateCalendar(d) { function updateCalendar(d) {
var $calendar = $('#calendar'); var $calendar = $('#calendar');
calendarData = d;
console.log(calendarData);
if (d.current !== null && d.current.hasOwnProperty('dtstart')) { if (d.current !== null && d.current.hasOwnProperty('dtstart')) {
var calString = [ var calString = [
'<div class="mui--text-subhead">', d.current.summary, '<div class="mui--text-subhead">', d.current.summary,

2
lib/mqtt/mqttConnect.js
View File

@ -169,7 +169,7 @@ module.exports = {
this.pingTimer = setTimeout(function() {this.ping();}.bind(this), 10000); this.pingTimer = setTimeout(function() {this.ping();}.bind(this), 10000);
}, },
ping: function() { ping: function() {
logger.error('Ping!'); //logger.error('Ping!');
this.sendRefresh(); this.sendRefresh();
var now = new Date; var now = new Date;
var mod = 10000 - (now.getTime() % 10000); var mod = 10000 - (now.getTime() % 10000);