Skip to content

Fixed incorrect time displayed at 12 am/pm #10

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

Merged
merged 2 commits into from
Oct 29, 2025
Merged

Fixed incorrect time displayed at 12 am/pm #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c9ed1c
fix: wrong time display at 12 am/pm
hohaicongthuan Oct 27, 2025
49e1c60
test: add tests for 12am/pm
hohaicongthuan Oct 27, 2025
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
14 changes: 14 additions & 0 deletions src/Clock.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,4 +159,18 @@ describe("Clock.vue", () => {
expect(wrapper.find(".clock__hour")[0].text()).toContain("09");
expect(wrapper.find(".clock__ampm")[0].text()).toContain("pm");
});

it("displays 12pm (noon/midday) in twelveHour mode", () => {
clock.tick(12 * hours);
const wrapper = mount(Clock, { propsData: { twelveHour: true } });
expect(wrapper.find(".clock__hour")[0].text()).toContain("12");
expect(wrapper.find(".clock__ampm")[0].text()).toContain("pm");
});

it("displays 12am (midnight) in twelveHour mode", () => {
clock.tick(0 * hours);
const wrapper = mount(Clock, { propsData: { twelveHour: true } });
expect(wrapper.find(".clock__hour")[0].text()).toContain("12");
expect(wrapper.find(".clock__ampm")[0].text()).toContain("am");
});
});
6 changes: 3 additions & 3 deletions src/Clock.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@ const getMinutes = () => padZero(getDate().getMinutes());

const getHour = twelveHour => {
let hours = getDate().getHours();
if (twelveHour && hours > 12) {
hours = hours - 12;
if (twelveHour) {
hours = hours % 12 || 12;
}
return padZero(hours);
};

const getAmPm = () => (getDate().getHours() > 12 ? "pm" : "am");
const getAmPm = () => (getDate().getHours() >= 12 ? "pm" : "am");

export default {
name: "vue-digital-clock",
Expand Down