From 49fb9108e98aafb706f40a54bd3c354d90f36477 Mon Sep 17 00:00:00 2001 From: Brian Date: Mon, 16 Jan 2017 02:49:08 +0100 Subject: [PATCH 1/3] Add Regexp possibility to titleReplace Check if the given needle is a regexp, if so create one and use it instead --- modules/default/calendar/calendar.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/default/calendar/calendar.js b/modules/default/calendar/calendar.js index b636b30b..d0527408 100644 --- a/modules/default/calendar/calendar.js +++ b/modules/default/calendar/calendar.js @@ -379,6 +379,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); } From c1a5f59c422a84109b3ad4a265924f8b66080a08 Mon Sep 17 00:00:00 2001 From: Brian Date: Mon, 16 Jan 2017 02:52:50 +0100 Subject: [PATCH 2/3] Remove Trailing space --- modules/default/calendar/calendar.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/default/calendar/calendar.js b/modules/default/calendar/calendar.js index d0527408..9ecf1389 100644 --- a/modules/default/calendar/calendar.js +++ b/modules/default/calendar/calendar.js @@ -382,7 +382,7 @@ Module.register("calendar", { var regParts = needle.match(/^\/(.+)\/([gim]*)$/); if (regParts) { - // the parsed pattern is a regexp. + // the parsed pattern is a regexp. needle = new RegExp(regParts[1], regParts[2]); } From fc00966b8b0057a62126bce669f52f9d177ac6dc Mon Sep 17 00:00:00 2001 From: Brian Date: Tue, 17 Jan 2017 11:05:18 +0100 Subject: [PATCH 3/3] Update CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e0caa6de..0e2b73e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Russian Translation - Afrikaans Translation - Add postinstall script to notify user that MagicMirror installed successfully despite warnings from NPM. +- Option to use RegExp in Calendar's titleReplace. ### Fixed - Update .gitignore to not ignore default modules folder.