Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

TMS-1032: Add seconds to countdown-timer block #506

Merged
merged 4 commits into from
May 13, 2024
Merged

TMS-1032: Add seconds to countdown-timer block #506

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
db16bb7
TMS-1032: Add seconds to countdown-timer block
eebbi Apr 25, 2024
06e1738
TMS-1032: Fix target timestamp for countdown with seconds
eebbi May 6, 2024
7e2160e
TMS-1032: CR fixes
eebbi May 10, 2024
1337779
Merge branch 'master' into TMS-1032
eebbi May 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.MD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [Unreleased]

- TMS-1032:
- Add seconds to countdown-timer block
- Change countdown update interval to a second if seconds are shown

## [1.54.9] - 2024-04-18

- TMS-1031: Fix event-component recurring manual-event dates
Expand Down
14 changes: 11 additions & 3 deletions assets/scripts/countdown.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,19 @@ export default class Countdown {
countdown.days_container = countdown.querySelector( '.countdown__time--days' );
countdown.hours_container = countdown.querySelector( '.countdown__time--hours' );
countdown.minutes_container = countdown.querySelector( '.countdown__time--minutes' );
countdown.seconds_container = countdown.querySelector( '.countdown__time--seconds' );
countdown.offset = countdown.dataset.offset ? countdown.dataset.offset : 0;

const target = parseInt( countdown.dataset.timestamp, 10 ) * 1000;

this.updateCountdownTime( countdown, target, null );

const MINUTE_IN_MS = 1000 * 60;
const SECONDS_IN_MS = 1000;

const interval = setInterval( () => {
this.updateCountdownTime( countdown, target, interval );
}, MINUTE_IN_MS );
}, countdown.seconds_container ? SECONDS_IN_MS : MINUTE_IN_MS );
}
}

Expand All @@ -61,11 +63,13 @@ export default class Countdown {
diff = targetTime - now,
days = Math.floor( diff / ( 1000 * 60 * 60 * 24 ) ),
hours = Math.floor( ( diff % ( 1000 * 60 * 60 * 24 ) ) / ( 1000 * 60 * 60 ) ),
minutes = Math.floor( ( diff % ( 1000 * 60 * 60 ) ) / ( 1000 * 60 ) );
minutes = Math.floor( ( diff % ( 1000 * 60 * 60 ) ) / ( 1000 * 60 ) ),
seconds = Math.floor( ( diff % ( 1000 * 60 ) ) / 1000 );
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Näissä ois varmaan voinut käyttää näitä laskettuja arvoja hyödyksi, esim. days = Math.floor( ( diff % days ) / ( 1000 * 60 * 60 ) ) tjsp. Mutta ei tarvi nyt alkaa muuttamaan.


const isDaysExpired = days < 0;
const isHoursExpired = hours < 0;
const isMinutesExpired = minutes < 0;
const isSecondsExpired = seconds < 0;

if ( ! isDaysExpired && countdown.days_container ) {
countdown.days_container.querySelector( '.countdown__figure' ).innerHTML = days.toString();
Expand All @@ -79,7 +83,11 @@ export default class Countdown {
countdown.minutes_container.querySelector( '.countdown__figure' ).innerHTML = minutes.toString();
}

const isExpired = isDaysExpired && isHoursExpired && isMinutesExpired;
if ( ! isSecondsExpired && countdown.seconds_container ) {
countdown.seconds_container.querySelector( '.countdown__figure' ).innerHTML = seconds.toString();
}

const isExpired = isDaysExpired && isHoursExpired && isMinutesExpired && isSecondsExpired;

if ( isExpired ) {
countdown.classList.add( 'countdown--is-expired' );
Expand Down
7 changes: 7 additions & 0 deletions assets/styles/blocks/custom/_countdown.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,13 @@
}
}
}

@include from($tablet) {
&--seconds {
width: 125px;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Saisko laitettua remeinä?

text-align: center;
}
}
}

&__expired-text {
Expand Down
Binary file modified lang/fi.mo
View file
Open in desktop
Binary file not shown.
66 changes: 45 additions & 21 deletions lang/fi.po
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
msgid ""
msgstr ""
"Project-Id-Version: TMS Theme Base\n"
"POT-Creation-Date: 2024-01-11 14:07+0200\n"
"PO-Revision-Date: 2024-01-11 14:08+0200\n"
"POT-Creation-Date: 2024-04-24 22:45+0300\n"
"PO-Revision-Date: 2024-04-24 22:46+0300\n"
"Last-Translator: \n"
"Language-Team: \n"
"Language: fi\n"
Expand All @@ -23,9 +23,28 @@ msgstr ""
"X-Poedit-SearchPathExcluded-1: vendor\n"
"X-Poedit-SearchPathExcluded-2: node_modules\n"

#: assets/dist/vendor.js:4630
msgctxt "text direction"
msgid "ltr"
#: assets/dist/vendor.js:1
msgid "entries"
msgstr ""

#: assets/dist/vendor.js:1
msgid "values"
msgstr ""

#: assets/dist/vendor.js:1
msgid "keys"
msgstr ""

#: assets/dist/vendor.js:1
msgid "Wrong index!"
msgstr ""

#: assets/dist/vendor.js:1
msgid "Wrong offset!"
msgstr ""

#: assets/dist/vendor.js:1
msgid "Wrong length!"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nää vendor-filun käännökset kannattaisi jättää pois, mutta ei tarvi nyt muuttaa kun ei näitä kauheeta läjää tullut

msgstr ""

#: comments.php:14
Expand Down Expand Up @@ -56,13 +75,13 @@ msgid "Open map"
msgstr "Avaa kartta"

#: lib/ACF/FrontPageGroup.php:38 lib/ACF/OnepagerGroup.php:73
#: lib/ACF/PageGroup.php:39
#: lib/ACF/PageGroup.php:41
msgctxt "theme ACF"
msgid "Page Components"
msgstr "Sivun komponentit"

#: lib/ACF/FrontPageGroup.php:90 lib/ACF/OnepagerGroup.php:126
#: lib/ACF/PageGroup.php:140 lib/ACF/PostGroup.php:173
#: lib/ACF/PageGroup.php:142 lib/ACF/PostGroup.php:173
msgctxt "theme ACF"
msgid "Components"
msgstr "Komponentit"
Expand Down Expand Up @@ -246,47 +265,47 @@ msgctxt "pagination"
msgid "Previous"
msgstr "Edellinen"

#: lib/Eventz.php:103
#: lib/Eventz.php:114
msgid "Dates"
msgstr "Päivät"

#: lib/Eventz.php:107
#: lib/Eventz.php:119
msgid "Time"
msgstr "Aika"

#: lib/Eventz.php:112
#: lib/Eventz.php:124
msgid "Location"
msgstr "Sijainti"

#: lib/Eventz.php:114
#: lib/Eventz.php:126
msgid "Price"
msgstr "Hinta"

#: lib/Eventz.php:116
#: lib/Eventz.php:128
msgid "Organizer"
msgstr "Järjestäjä"

#: lib/Eventz.php:117
#: lib/Eventz.php:129
msgid "Area"
msgstr ""

#: lib/Eventz.php:119
#: lib/Eventz.php:131
msgid "Target"
msgstr ""

#: lib/Eventz.php:121
#: lib/Eventz.php:133
msgid "Tags"
msgstr ""

#: lib/Eventz.php:125
#: lib/Eventz.php:137
msgid "Links"
msgstr "Linkit"

#: lib/Eventz.php:301
#: lib/Eventz.php:314
msgid "Additional information"
msgstr "Lisätiedot"

#: lib/Eventz.php:318
#: lib/Eventz.php:331
msgid "Free"
msgstr "Maksuton"

Expand All @@ -305,6 +324,11 @@ msgctxt "theme-frontend"
msgid "Minutes"
msgstr "Minuuttia"

#: lib/Formatters/CountdownFormatter.php:83 models/strings.php:232
msgctxt "theme-frontend"
msgid "Seconds"
msgstr "Sekuntia"

#: lib/Formatters/GridFormatter.php:151
msgid "Read more"
msgstr "Lue lisää"
Expand Down Expand Up @@ -659,7 +683,7 @@ msgid "Search from site"
msgstr "Hae sivustolta"

#: models/strings.php:55 models/strings.php:81 models/strings.php:143
#: models/strings.php:156 models/strings.php:165 models/strings.php:235
#: models/strings.php:156 models/strings.php:165 models/strings.php:236
msgctxt "theme-frontend"
msgid "Close"
msgstr "Sulje"
Expand Down Expand Up @@ -1103,12 +1127,12 @@ msgctxt "theme-frontend"
msgid "Dec"
msgstr "Jou"

#: models/strings.php:234
#: models/strings.php:235
msgctxt "theme-frontend"
msgid "Enlarged image"
msgstr "Suurennettu kuva"

#: models/strings.php:248
#: models/strings.php:249
msgid "Pagination"
msgstr "Sivutus"

Expand Down
64 changes: 44 additions & 20 deletions lang/tms-theme-base.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
msgid ""
msgstr ""
"Project-Id-Version: TMS Theme Base\n"
"POT-Creation-Date: 2024-01-11 14:07+0200\n"
"POT-Creation-Date: 2024-04-24 22:45+0300\n"
"PO-Revision-Date: 2022-01-12 10:08+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
Expand All @@ -23,9 +23,28 @@ msgstr ""
"X-Poedit-SearchPathExcluded-1: vendor\n"
"X-Poedit-SearchPathExcluded-2: node_modules\n"

#: assets/dist/vendor.js:4630
msgctxt "text direction"
msgid "ltr"
#: assets/dist/vendor.js:1
msgid "entries"
msgstr ""

#: assets/dist/vendor.js:1
msgid "values"
msgstr ""

#: assets/dist/vendor.js:1
msgid "keys"
msgstr ""

#: assets/dist/vendor.js:1
msgid "Wrong index!"
msgstr ""

#: assets/dist/vendor.js:1
msgid "Wrong offset!"
msgstr ""

#: assets/dist/vendor.js:1
msgid "Wrong length!"
msgstr ""

#: comments.php:14
Expand Down Expand Up @@ -56,13 +75,13 @@ msgid "Open map"
msgstr ""

#: lib/ACF/FrontPageGroup.php:38 lib/ACF/OnepagerGroup.php:73
#: lib/ACF/PageGroup.php:39
#: lib/ACF/PageGroup.php:41
msgctxt "theme ACF"
msgid "Page Components"
msgstr ""

#: lib/ACF/FrontPageGroup.php:90 lib/ACF/OnepagerGroup.php:126
#: lib/ACF/PageGroup.php:140 lib/ACF/PostGroup.php:173
#: lib/ACF/PageGroup.php:142 lib/ACF/PostGroup.php:173
msgctxt "theme ACF"
msgid "Components"
msgstr ""
Expand Down Expand Up @@ -246,47 +265,47 @@ msgctxt "pagination"
msgid "Previous"
msgstr ""

#: lib/Eventz.php:103
#: lib/Eventz.php:114
msgid "Dates"
msgstr ""

#: lib/Eventz.php:107
#: lib/Eventz.php:119
msgid "Time"
msgstr ""

#: lib/Eventz.php:112
#: lib/Eventz.php:124
msgid "Location"
msgstr ""

#: lib/Eventz.php:114
#: lib/Eventz.php:126
msgid "Price"
msgstr ""

#: lib/Eventz.php:116
#: lib/Eventz.php:128
msgid "Organizer"
msgstr ""

#: lib/Eventz.php:117
#: lib/Eventz.php:129
msgid "Area"
msgstr ""

#: lib/Eventz.php:119
#: lib/Eventz.php:131
msgid "Target"
msgstr ""

#: lib/Eventz.php:121
#: lib/Eventz.php:133
msgid "Tags"
msgstr ""

#: lib/Eventz.php:125
#: lib/Eventz.php:137
msgid "Links"
msgstr ""

#: lib/Eventz.php:301
#: lib/Eventz.php:314
msgid "Additional information"
msgstr ""

#: lib/Eventz.php:318
#: lib/Eventz.php:331
msgid "Free"
msgstr ""

Expand All @@ -305,6 +324,11 @@ msgctxt "theme-frontend"
msgid "Minutes"
msgstr ""

#: lib/Formatters/CountdownFormatter.php:83 models/strings.php:232
msgctxt "theme-frontend"
msgid "Seconds"
msgstr ""

#: lib/Formatters/GridFormatter.php:151
msgid "Read more"
msgstr ""
Expand Down Expand Up @@ -650,7 +674,7 @@ msgid "Search from site"
msgstr ""

#: models/strings.php:55 models/strings.php:81 models/strings.php:143
#: models/strings.php:156 models/strings.php:165 models/strings.php:235
#: models/strings.php:156 models/strings.php:165 models/strings.php:236
msgctxt "theme-frontend"
msgid "Close"
msgstr ""
Expand Down Expand Up @@ -1092,12 +1116,12 @@ msgctxt "theme-frontend"
msgid "Dec"
msgstr ""

#: models/strings.php:234
#: models/strings.php:235
msgctxt "theme-frontend"
msgid "Enlarged image"
msgstr ""

#: models/strings.php:248
#: models/strings.php:249
msgid "Pagination"
msgstr ""

Expand Down
Loading
Loading