Guzio/out-of-your-element
1
0
Fork 0
forked from cadence/out-of-your-element
Code Pull requests Activity

git is being funny again #14

Merged
Guzio merged 3 commits from cadence/out-of-your-element:main into mergable-fr-fr 2026-10-13 10:30:09 +00:00
Conversation 0 Commits 3 Files changed 5 +5 -3
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit a4f8f93ad9 - Show all commits

Put "and" between duration units if there's only 2

Prev Next
Cadence Ember 2026-10-13 22:06:27 +13:00
commit a4f8f93ad9

8
src/web/pug/time.pug
View file

@ -67,7 +67,6 @@ html(lang="en")
if style !== "R" if style !== "R"
p #[span#remaining.remaining]#[span#direction] #[span#tick.tick] p #[span#remaining.remaining]#[span#direction] #[span#tick.tick]
script. script.
document.body.classList.add("yes-script")
const WIDTH = !{WIDTH} const WIDTH = !{WIDTH}
const timestamp = !{timestamp} const timestamp = !{timestamp}
const style = "!{style}" const style = "!{style}"
@ -104,6 +103,7 @@ html(lang="en")
st.style.fontSize = Math.floor(parseInt(st.style.fontSize) * WIDTH / l) + "px"; st.style.fontSize = Math.floor(parseInt(st.style.fontSize) * WIDTH / l) + "px";
} }
} }
document.body.classList.add("yes-script")
let frame = 0 let frame = 0
function updateTimeRemaining() { function updateTimeRemaining() {
@ -116,15 +116,17 @@ html(lang="en")
} }
let difference = Math.abs(timeForRemaining.getTime() - now.getTime()) let difference = Math.abs(timeForRemaining.getTime() - now.getTime())
// Temporal.Duration isn't Baseline https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Temporal/Duration
let foundSignificantField = false let foundSignificantField = false
let remainingText = UNITS.map(([unit, duration], index) => { const remainingTextParts = UNITS.map(([unit, duration], index) => {
const multiplier = Math.floor(difference / duration) const multiplier = Math.floor(difference / duration)
difference -= multiplier * duration difference -= multiplier * duration
if (multiplier > 0 || foundSignificantField) { if (multiplier > 0 || foundSignificantField) {
foundSignificantField = true foundSignificantField = true
return multiplier + "\u00a0" + unit + (multiplier !== 1 ? "s" : "") return multiplier + "\u00a0" + unit + (multiplier !== 1 ? "s" : "")
} }
}).filter(s => s).join(", ") }).filter(s => s)
const remainingText = remainingTextParts.length === 2 ? remainingTextParts.join(" and ") : remainingTextParts.join(", ")
if (remainingText) { if (remainingText) {
remaining.textContent = remainingText remaining.textContent = remainingText
direction.textContent = direction.textContent =