extern/glance
1
0
Fork 0
mirror of https://github.com/glanceapp/glance.git synced 2025-06-21 18:31:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: non-whole-hour timezones now correctly shown on Clock

Browse Source 
Timezones that used non-whole-hour definitions (ie. Australia/ACDT) not correctly shown on the Clock widget. This fix changes how the difference is calculated to account for both minutes, and hours.

Due to the change, the text shown for relative timezone differences also had to be changed.
This commit is contained in:
Oliver Mitchell 2024-10-29 00:00:37 +10:30
parent d90d39933a
commit 1e2e66ecf7
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
internal/assets/static/js/main.js
View File

@ -502,9 +502,24 @@ function timeInZone(now, zone) {
timeInZone = now
}
const diffInHours = Math.round((timeInZone.getTime() - now.getTime()) / 1000 / 60 / 60);
const diffInMinutes = Math.round((timeInZone.getTime() - now.getTime()) / 1000 / 60);
return { time: timeInZone, diffInHours: diffInHours };
return { time: timeInZone, diffInMinutes: diffInMinutes };
}
function zoneDiffText(diffInMinutes) {
if (diffInMinutes == 0) {
return "";
}
const sign = diffInMinutes < 0 ? "-" : "+";
diffInMinutes = Math.abs(diffInMinutes);
const hours = `${Math.floor(diffInMinutes / 60)}`.padStart(2, '0');
const minutes = `${diffInMinutes % 60}`.padStart(2, '0');
return `${sign}${hours}:${minutes}`;
}
function setupClocks() {
@ -547,9 +562,9 @@ function setupClocks() {
);
updateCallbacks.push((now) => {
const { time, diffInHours } = timeInZone(now, timeZoneContainer.dataset.timeInZone);
const { time, diffInMinutes } = timeInZone(now, timeZoneContainer.dataset.timeInZone);
setZoneTime(time);
diffElement.textContent = (diffInHours <= 0 ? diffInHours : '+' + diffInHours) + 'h';
diffElement.textContent = zoneDiffText(diffInMinutes);
});
}
}