kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-27 11:50:00 +00:00
Code Issues Projects Releases Wiki Activity

fix linting errors. add line to changelog

Browse Source
This commit is contained in:
= 2018-05-10 19:54:01 -04:00
parent e492012004
commit c6bf69cce4
2 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -13,6 +13,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- Added scroll up in fullscreen newsfeed article view - Added scroll up in fullscreen newsfeed article view
- Changed fullscreen newsfeed width from 100% to 100vw (better results) - Changed fullscreen newsfeed width from 100% to 100vw (better results)
- Added option to calendar module that colors only the symbol instead of the whole line - Added option to calendar module that colors only the symbol instead of the whole line
- Added option for new display format in the calendar module with date headers with times/events below.
### Changed ### Changed
- Use Electron 2 Beta. **Please test!** - Use Electron 2 Beta. **Please test!**

36
modules/default/calendar/calendar.js
View File

@ -132,7 +132,7 @@ Module.register("calendar", {
return wrapper; return wrapper;
} }
var lastSeenDate = ''; var lastSeenDate = "";
for (var e in events) { for (var e in events) {
var event = events[e]; var event = events[e];
@ -154,7 +154,7 @@ Module.register("calendar", {
} }
var eventWrapper = document.createElement("tr"); var eventWrapper = document.createElement("tr");
if (this.config.colored && !this.config.coloredSymbolOnly) { if (this.config.colored && !this.config.coloredSymbolOnly) {
@ -215,11 +215,11 @@ Module.register("calendar", {
} }
if(this.config.timeFormat === "dateheaders"){ if(this.config.timeFormat === "dateheaders"){
if (event.fullDayEvent) { if (event.fullDayEvent) {
titleWrapper.colSpan = "2"; titleWrapper.colSpan = "2";
titleWrapper.align = "left"; titleWrapper.align = "left";
}else{ }else{
var timeWrapper = document.createElement("td"); var timeWrapper = document.createElement("td");
timeWrapper.className = "time light"; timeWrapper.className = "time light";
@ -227,24 +227,24 @@ Module.register("calendar", {
timeWrapper.style.paddingLeft = "2px"; timeWrapper.style.paddingLeft = "2px";
var timeFormatString = ""; var timeFormatString = "";
switch (config.timeFormat) { switch (config.timeFormat) {
case 12: { case 12: {
timeFormatString = "h:mm A"; timeFormatString = "h:mm A";
break; break;
} }
case 24: { case 24: {
timeFormatString = "HH:mm"; timeFormatString = "HH:mm";
break; break;
} }
default: { default: {
timeFormatString = "HH:mm"; timeFormatString = "HH:mm";
break; break;
} }
} }
timeWrapper.innerHTML = moment(event.startDate, "x").format(timeFormatString); timeWrapper.innerHTML = moment(event.startDate, "x").format(timeFormatString);
eventWrapper.appendChild(timeWrapper); eventWrapper.appendChild(timeWrapper);
titleWrapper.align = "right"; titleWrapper.align = "right";
} }
eventWrapper.appendChild(titleWrapper); eventWrapper.appendChild(titleWrapper);
}else{ }else{
var timeWrapper = document.createElement("td"); var timeWrapper = document.createElement("td");
@ -418,7 +418,7 @@ Module.register("calendar", {
continue; continue;
} }
} }
if(this.listContainsEvent(events,event)){ if(this.listContainsEvent(events,event)){
continue; continue;
} }
event.url = c; event.url = c;