Merge pull request #8 from MichMich/develop

Develop
This commit is contained in:
ashishtank 2020-12-31 18:51:38 +01:00 committed by GitHub
commit 3fa98bc1aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 3 deletions

View File

@ -39,6 +39,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)
@ -59,6 +60,9 @@ _This release is scheduled to be released on 2021-01-01._
- update node-ical version again, 0.12.5, change RRULE fix (#2371, #2379)
- Added missing function call in module.show()
- 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

View File

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

View File

@ -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 + "}";
});
}

View File

@ -79,11 +79,11 @@
"iconv-lite": "^0.6.2",
"module-alias": "^2.2.2",
"moment": "^2.29.1",
"node-ical": "^0.12.5",
"node-ical": "^0.12.7",
"request": "^2.88.2",
"rrule": "^2.6.6",
"rrule-alt": "^2.2.8",
"simple-git": "^2.26.0",
"simple-git": "^2.31.0",
"socket.io": "^3.0.4",
"valid-url": "^1.0.9"
},