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

Merge branch 'develop' of https://github.com/artifactdev/MagicMirror

Browse Source 
# Conflicts:
#	modules/default/calendar/README.md
#	modules/default/weatherforecast/README.md
This commit is contained in:
Jeremias Arnstadt
2017-01-29 00:53:07 +01:00
parent 4214293b76 9bd42ac221
commit bc257f4951
50 changed files with 772 additions and 1086 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -390,7 +390,7 @@ Module.register("calendar", {
/* capFirst(string)
* Capitalize the first letter of a string
* Eeturn capitalized string
* Return capitalized string
*/
capFirst: function (string) {
@@ -409,6 +409,13 @@ Module.register("calendar", {
titleTransform: function (title) {
for (var needle in this.config.titleReplace) {
var replacement = this.config.titleReplace[needle];
var regParts = needle.match(/^\/(.+)\/([gim]*)$/);
if (regParts) {
// the parsed pattern is a regexp.
needle = new RegExp(regParts[1], regParts[2]);
}
title = title.replace(needle, replacement);
}