From c7eabbee8ce7ac21a53047c6c42d1f018ff77c51 Mon Sep 17 00:00:00 2001 From: thyttan <6uuxstm66@mozmail.comā©> Date: Sat, 4 Jan 2025 00:06:35 +0100 Subject: [PATCH] doztime: Bangle 1 - fix scoping of vars `time` and `wait` --- apps/doztime/ChangeLog | 1 + apps/doztime/app-bangle1.js | 10 ++++++---- apps/doztime/metadata.json | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/apps/doztime/ChangeLog b/apps/doztime/ChangeLog index dc73a3c238..0af4145d72 100644 --- a/apps/doztime/ChangeLog +++ b/apps/doztime/ChangeLog @@ -7,3 +7,4 @@ now supports Adjust Clock widget, if installed 0.06: Minor code improvements 0.07: Bangle2: Shift the position of one line on the screen +0.08: Bangle1: fix scoping of variables `time` and `wait` diff --git a/apps/doztime/app-bangle1.js b/apps/doztime/app-bangle1.js index a176ef270d..a2a8665cce 100644 --- a/apps/doztime/app-bangle1.js +++ b/apps/doztime/app-bangle1.js @@ -159,20 +159,22 @@ function drawTime() let date = ""; let timeDef; let x = 0; + let time; + let wait; dt.setDate(dt.getDate()); if(addTimeDigit){ x = 10368*dt.getHours()+172.8*dt.getMinutes()+2.88*dt.getSeconds()+0.00288*dt.getMilliseconds(); let msg = "00000"+Math.floor(x).toString(12); - let time = msg.substr(-5,3)+"."+msg.substr(-2); //TODO: should `time` and `wait` have been defined outside the if block? - let wait = 347*(1-(x%1)); + time = msg.substr(-5,3)+"."+msg.substr(-2); + wait = 347*(1-(x%1)); timeDef = time6; } else { x = 864*dt.getHours()+14.4*dt.getMinutes()+0.24*dt.getSeconds()+0.00024*dt.getMilliseconds(); let msg = "0000"+Math.floor(x).toString(12); - let time = msg.substr(-4,3)+"."+msg.substr(-1); - let wait = 4167*(1-(x%1)); + time = msg.substr(-4,3)+"."+msg.substr(-1); + wait = 4167*(1-(x%1)); timeDef = time5; } if(lastX > x){ res = getDate(dt); } // calculate date once at start-up and once when turning over to a new day diff --git a/apps/doztime/metadata.json b/apps/doztime/metadata.json index 407b474cac..f0bb84a8b0 100644 --- a/apps/doztime/metadata.json +++ b/apps/doztime/metadata.json @@ -2,7 +2,7 @@ "id": "doztime", "name": "Dozenal Digital Time", "shortName": "Dozenal Digital", - "version": "0.07", + "version": "0.08", "description": "A dozenal Holocene calendar and dozenal diurnal digital clock", "icon": "app.png", "type": "clock",