kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-08-21 12:55:22 +00:00
Code Issues Projects Releases Wiki Activity

Fix Merge Conflicts.

Browse Source
This commit is contained in:
Michael Teeuw
2017-03-17 14:32:01 +01:00
parent 15b19925f2
commit 4aec39df7a
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,6 +16,7 @@ Module.register("clock",{
showPeriodUpper: false,
clockBold: false,
showDate: true,
dateFormat: "dddd, LL",
/* specific to the analog clock */
analogSize: "200px",
@@ -87,7 +88,7 @@ Module.register("clock",{
}
if(this.config.showDate){
dateWrapper.innerHTML = now.format("dddd, LL");
dateWrapper.innerHTML = now.format(this.config.dateFormat);
}
timeWrapper.innerHTML = timeString;
secondsWrapper.innerHTML = now.format("ss");