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

Merge branch 'develop' into fix-update

Browse Source
This commit is contained in:
sam detweiler 2020-12-31 09:35:29 -06:00 committed by GitHub
commit 6a786aa090
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -38,6 +38,7 @@ _This release is scheduled to be released on 2021-01-01._
### Fixed ### Fixed
- No select Text for TouchScreen use
- JSON Parse translation files with comments crashing UI. (#2149) - JSON Parse translation files with comments crashing UI. (#2149)
- Calendar parsing where RRULE bug returns wrong date, add Windows timezone name support. (#2145, #2151) - Calendar parsing where RRULE bug returns wrong date, add Windows timezone name support. (#2145, #2151)
- Wrong node-ical version installed (package.json) requested version. (#2153) - Wrong node-ical version installed (package.json) requested version. (#2153)
@ -60,6 +61,7 @@ _This release is scheduled to be released on 2021-01-01._
- remove undefined objects from modules array (#2382) - remove undefined objects from modules array (#2382)
- update node-ical version again, 0.12.7, change RRULE fix (#2371, #2379), node-ical now throws error (which we catch) - update node-ical version again, 0.12.7, change RRULE fix (#2371, #2379), node-ical now throws error (which we catch)
- update simple-git version to 2.31 unhandled promise rejection (#2383) - update simple-git version to 2.31 unhandled promise rejection (#2383)
- Translator variables can have falsy values (e.g. empty string)
## [2.13.0] - 2020-10-01 ## [2.13.0] - 2020-10-01

1
css/main.css
View File

@ -2,6 +2,7 @@ html {
cursor: none; cursor: none;
overflow: hidden; overflow: hidden;
background: #000; background: #000;
user-select: none;
} }
::-webkit-scrollbar { ::-webkit-scrollbar {

2
js/translator.js
View File

@ -68,7 +68,7 @@ var Translator = (function () {
template = variables.fallback; template = variables.fallback;
} }
return template.replace(new RegExp("{([^}]+)}", "g"), function (_unused, varName) { return template.replace(new RegExp("{([^}]+)}", "g"), function (_unused, varName) {
return variables[varName] || "{" + varName + "}"; return varName in variables ? variables[varName] : "{" + varName + "}";
}); });
} }