kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-11-03 20:55:29 +00:00
Code Issues Projects Releases Wiki Activity

Possible fix for #181

Browse Source
This commit is contained in:
Michael Teeuw
2016-04-18 19:12:24 +02:00
parent bef5b48fce
commit 8793196bb3
2 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
modules/default/clock/clock.js
View File

@@ -48,9 +48,18 @@ Module.register("clock",{
secondsWrapper.className = "dimmed";
// Set content of wrappers.
var format = (this.config.timeFormat === 24) ? "HH:mm" : "hh:mm a";
// The moment().format('h') method has a bug on the Raspberry Pi.
// So we need to generate the timestring manually.
// See issue: https://github.com/MichMich/MagicMirror/issues/181
var timeString = moment().format('HH:mm');
if (this.config.timeFormat !== 24) {
var now = new Date();
var hours = now.getHours() % 12 || 12;
timeString = hours + moment().format(':mm a');
}
dateWrapper.innerHTML = moment().format("dddd, LL");
timeWrapper.innerHTML = moment().format(format);
timeWrapper.innerHTML = timeString;
secondsWrapper.innerHTML = moment().format("ss");
// Combine wrappers.