mirror of
https://github.com/MichMich/MagicMirror.git
synced 2025-06-27 19:53:36 +00:00
Merge branch 'develop' into fix-update
This commit is contained in:
commit
6a786aa090
@ -38,6 +38,7 @@ _This release is scheduled to be released on 2021-01-01._
|
||||
|
||||
### Fixed
|
||||
|
||||
- No select Text for TouchScreen use
|
||||
- JSON Parse translation files with comments crashing UI. (#2149)
|
||||
- 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)
|
||||
@ -60,6 +61,7 @@ _This release is scheduled to be released on 2021-01-01._
|
||||
- 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 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,6 +2,7 @@ html {
|
||||
cursor: none;
|
||||
overflow: hidden;
|
||||
background: #000;
|
||||
user-select: none;
|
||||
}
|
||||
|
||||
::-webkit-scrollbar {
|
||||
|
@ -68,7 +68,7 @@ var Translator = (function () {
|
||||
template = variables.fallback;
|
||||
}
|
||||
return template.replace(new RegExp("{([^}]+)}", "g"), function (_unused, varName) {
|
||||
return variables[varName] || "{" + varName + "}";
|
||||
return varName in variables ? variables[varName] : "{" + varName + "}";
|
||||
});
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user