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 pull request #624 from tosti007/Calendar_Regex

Browse Source 
Add Regexp possibility to titleReplace
This commit is contained in:
Michael Teeuw 2017-01-17 11:07:42 +01:00 committed by GitHub
commit bd277b087a
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -19,6 +19,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- Russian Translation - Russian Translation
- Afrikaans Translation - Afrikaans Translation
- Add postinstall script to notify user that MagicMirror installed successfully despite warnings from NPM. - Add postinstall script to notify user that MagicMirror installed successfully despite warnings from NPM.
- Option to use RegExp in Calendar's titleReplace.
### Fixed ### Fixed
- Update .gitignore to not ignore default modules folder. - Update .gitignore to not ignore default modules folder.

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

@ -379,6 +379,13 @@ Module.register("calendar", {
titleTransform: function (title) { titleTransform: function (title) {
for (var needle in this.config.titleReplace) { for (var needle in this.config.titleReplace) {
var replacement = this.config.titleReplace[needle]; 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); title = title.replace(needle, replacement);
} }