Merge branch 'develop' into tests

CHANGELOG.md

@@ -10,6 +10,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Installer: Use init config.js from config.js.sample.
 - Switched out `rrule` package for `rrule-alt` in order to improve calendar issues. (Experimental: [#565](https://github.com/MichMich/MagicMirror/issues/565))
 - Make mouse events pass through the region fullscreen_above to modules below.
+- Scaled the splash screen down to make it a bit more subtle.
 
 ### Added
 - Add loaded function to modules, providing an async callback.
@@ -19,6 +20,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Afrikaans Translation
 - Add postinstall script to notify user that MagicMirror installed successfully despite warnings from NPM.
 - Init tests using mocha.
+- Option to use RegExp in Calendar's titleReplace.
+
 
 ### Fixed
 - Update .gitignore to not ignore default modules folder.

modules/default/calendar/calendar.js

@@ -360,7 +360,7 @@ Module.register("calendar", {
 
 	/* capFirst(string)
 	 * Capitalize the first letter of a string
-	 * Eeturn capitalized string
+	 * Return capitalized string
 	 */
 
 	capFirst: function (string) {
@@ -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);
 		}
 

modules/default/calendar/node_helper.js

@@ -12,7 +12,6 @@ var CalendarFetcher = require("./calendarfetcher.js");
 module.exports = NodeHelper.create({
 	// Override start method.
 	start: function() {
-		var self = this;
 		var events = [];
 
 		this.fetchers = [];