From eae416b5e2baa342327644d4969442ffa4442bf3 Mon Sep 17 00:00:00 2001 From: Carmine De Rosa Date: Sun, 15 Apr 2018 17:37:16 +0200 Subject: [PATCH] fix safari countdown --- device/script.js | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/device/script.js b/device/script.js index 0411c38..19d3d97 100644 --- a/device/script.js +++ b/device/script.js @@ -14,9 +14,18 @@ $(document).ready(()=>{ if(session.enabled){ $.each(session.messages, (index,item)=>{ if(item.timer != session.start){ - const now = Date.now() / 1000; - const timer = Date.parse(item.timer) / 1000; - const start = Date.parse(session.start) / 1000; + + const now = new Date().getTime(); + + const timerValue = item.timer.split(' '); + const timerDate = timerValue[0].split('-'); + const timerHours = timerValue[1].split(':'); + const timer = new Date(timerDate[0], timerDate[1] - 1, timerDate[2], timerHours[0], timerHours[1], timerHours[2]).getTime(); + + const startValue = session.start.split(' '); + const startDate = startValue[0].split('-'); + const startHours = startValue[1].split(':'); + const start = new Date(startDate[0], startDate[1] - 1, startDate[2], startHours[0], startHours[1], startHours[2]).getTime(); if(now > timer){ showCloud(item.title, [item.short_text, item.long_text], item.image, item.actions, session.messages); @@ -26,7 +35,7 @@ $(document).ready(()=>{ setTimeout( ()=>{ showCloud(item.title, [item.short_text, item.long_text], item.image, item.actions, session.messages); notify(true); - },1000*delay); + },delay); } } });