Merge pull request #2064 from MichMich/develop

Release 2.12.0

.editorconfig

@@ -0,0 +1,15 @@
+# editorconfig.org
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 2
+indent_style = space
+insert_final_newline = true
+max_line_length = 250
+trim_trailing_whitespace = true
+
+[*.{js,json}]
+indent_size = 4
+indent_style = tab

.eslintignore

@@ -1,6 +1 @@
-vendor/*
-!/vendor/vendor.js
-!/modules/default/**
-!/modules/node_helper
-!/modules/node_helper/**
-!/modules/default/defaultmodules.js
+modules/default/calendar/vendor/*

.eslintrc.json

@@ -1,16 +1,30 @@
 {
-	"rules": {
-		"indent": ["error", "tab"],
-		"quotes": ["error", "double"],
-		"max-len": ["error", 250],
-		"curly": "error",
-		"camelcase": ["error", {"properties": "never"}],
-		"no-trailing-spaces": ["error", {"ignoreComments": false }],
-		"no-irregular-whitespace": ["error"]
-	},
+	"extends": ["eslint:recommended", "plugin:prettier/recommended"],
+	"plugins": ["prettier"],
 	"env": {
 		"browser": true,
-		"node": true,
-		"es6": true
+		"es6": true,
+		"mocha": true,
+		"node": true
+	},
+	"globals": {
+		"config": true,
+		"Log": true,
+		"MM": true,
+		"Module": true,
+		"moment": true
+	},
+	"parserOptions": {
+		"sourceType": "module",
+		"ecmaVersion": 2017,
+		"ecmaFeatures": {
+			"globalReturn": true
+		}
+	},
+	"rules": {
+		"prettier/prettier": "error",
+		"eqeqeq": "error",
+		"no-prototype-builtins": "off",
+		"no-unused-vars": "off"
 	}
 }

.github/CONTRIBUTING.md

@@ -1,25 +1,24 @@
-Contribution Policy for MagicMirror²
-====================================
+# Contribution Policy for MagicMirror²
 
 Thanks for contributing to MagicMirror²!
 
 We hold our code to standard, and these standards are documented below.
 
-If you wish to run both linters, use `grunt` without any arguments.
+If you wish to run our linters, use `npm run lint` without any arguments.
 
 ### JavaScript: Run ESLint
 
-We use [ESLint](http://eslint.org) on our JavaScript files.
+We use [ESLint](https://eslint.org) on our JavaScript files.
 
 Our ESLint configuration is in our .eslintrc.json and .eslintignore files.
 
-To run ESLint, use `grunt eslint`.
+To run ESLint, use `npm run lint:js`.
 
 ### CSS: Run StyleLint
 
-We use [StyleLint](http://stylelint.io) to lint our CSS. Our configuration is in our .stylelintrc file.
+We use [StyleLint](https://stylelint.io) to lint our CSS. Our configuration is in our .stylelintrc file.
 
-To run StyleLint, use `grunt stylelint`.
+To run StyleLint, use `npm run lint:style`.
 
 ### Submitting Issues
 
@@ -30,7 +29,7 @@ Problems installing or configuring your MagicMirror? Check out: [https://forum.m
 
 When submitting a new issue, please supply the following information:
 
-**Platform**: Place your platform here... give us your web browser/Electron version *and* your hardware (Raspberry Pi 2/3, Windows, Mac, Linux, System V UNIX).
+**Platform**: Place your platform here... give us your web browser/Electron version _and_ your hardware (Raspberry Pi 2/3, Windows, Mac, Linux, System V UNIX).
 
 **Node Version**: Make sure it's version 0.12.13 or later.
 

.github/ISSUE_TEMPLATE.md

@@ -1,15 +1,33 @@
-Please only submit reproducible issues. 
+## I'm not sure if this is a bug
 
 If you're not sure if it's a real bug or if it's just you, please open a topic on the forum: [https://forum.magicmirror.builders/category/15/bug-hunt](https://forum.magicmirror.builders/category/15/bug-hunt)
+
+## I'm having troubles installing or configuring MagicMirror
+
 Problems installing or configuring your MagicMirror? Check out: [https://forum.magicmirror.builders/category/10/troubleshooting](https://forum.magicmirror.builders/category/10/troubleshooting)
 
+## I found a bug in the MagicMirror installer
+
+If you are facing an issue or found a bug while trying to install MagicMirror via the installer please report it in the respective GitHub repository:
+[https://github.com/sdetweil/MagicMirror_scripts](https://github.com/sdetweil/MagicMirror_scripts)
+
+## I found a bug in the MagicMirror Docker image
+
+If you are facing an issue or found a bug while running MagicMirror inside a Docker container please create an issue in the GitHub repository of the MagicMirror Docker image:
+[https://github.com/bastilimbach/docker-MagicMirror](https://github.com/bastilimbach/docker-MagicMirror)
+
+---
+
+## I found a bug in MagicMirror
+
+Please make sure to only submit reproducible issues. You can safely remove everything above the dividing line.
 When submitting a new issue, please supply the following information:
 
-**Platform**: Place your platform here... give us your web browser/Electron version *and* your hardware (Raspberry Pi 2/3, Windows, Mac, Linux, System V UNIX).
+**Platform**: Place your platform here... give us your web browser/Electron version _and_ your hardware (Raspberry Pi 2/3, Windows, Mac, Linux, System V UNIX).
 
-**Node Version**: Make sure it's version 0.12.13 or later.
+**Node Version**: Make sure it's version 8 or later.
 
-**MagicMirror Version**: Now that the versions have split, tell us if you are using the PHP version (v1) or the newer JavaScript version (v2).
+**MagicMirror Version**: Please let us now which version of MagicMirror you are running. It can be found in the `package.log` file.
 
 **Description**: Provide a detailed description about the issue and include specific details to help us understand the problem. Adding screenshots will help describing the problem.
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -7,8 +7,7 @@ pull request to send us your changes. This makes everyone's lives
 easier (including yours) and helps us out on the development team.
 Thanks!
 
-
-* Does the pull request solve a **related** issue?
-* If so, can you reference the issue?
-* What does the pull request accomplish? Use a list if needed.
-* If it includes major visual changes please add screenshots.
+- Does the pull request solve a **related** issue?
+- If so, can you reference the issue?
+- What does the pull request accomplish? Use a list if needed.
+- If it includes major visual changes please add screenshots.

.github/stale.yml

@@ -0,0 +1,19 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 60
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - pinned
+  - security
+  - under investigation
+  - pr welcome
+# Label to use when marking an issue as stale
+staleLabel: wontfix
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false

.gitignore

@@ -8,10 +8,11 @@ pids
 *.seed
 lib-cov
 coverage
-.grunt
 .lock-wscript
 build/Release
-node_modules
+/node_modules/**/*
+fonts/node_modules/**/*
+vendor/node_modules/**/*
 jspm_modules
 .npm
 .node_repl_history
@@ -19,6 +20,9 @@ jspm_modules
 # Visual Studio Code ignoramuses.
 .vscode/
 
+# IDE Code ignoramuses.
+.idea/
+
 # Various Windows ignoramuses.
 Thumbs.db
 ehthumbs.db
@@ -54,12 +58,6 @@ Temporary Items
 .directory
 .Trash-*
 
-# Various Magic Mirror ignoramuses and anti-ignoramuses.
-
-# Don't ignore the node_helper core module.
-!/modules/node_helper
-!/modules/node_helper/**
-
 # Ignore all modules except the default modules.
 /modules/**
 !/modules/default
@@ -78,3 +76,5 @@ Temporary Items
 *.orig
 *.rej
 *.bak
+
+!/tests/node_modules/**/*

.prettierignore

@@ -0,0 +1,5 @@
+package-lock.json
+/config/**/*
+/modules/default/calendar/vendor/ical.js/**/*
+/vendor/**/*
+!/vendor/vendor.js

.prettierrc.json

@@ -0,0 +1,3 @@
+{
+	"trailingComma": "none"
+}

.snyk

@@ -1,14 +0,0 @@
-version: v1.5.2
-ignore: {}
-patch:
-  'npm:minimatch:20160620':
-    - snyk > recursive-readdir > minimatch:
-        patched: '2016-07-30T14:02:31.280Z'
-  'npm:negotiator:20160616':
-    - socket.io > engine.io > accepts > negotiator:
-        patched: '2016-07-30T14:02:31.280Z'
-  'npm:ws:20160624':
-    - socket.io > engine.io > ws:
-        patched: '2016-07-30T14:02:31.280Z'
-    - socket.io > socket.io-client > engine.io-client > ws:
-        patched: '2016-07-30T14:02:31.280Z'

.stylelintrc

@@ -1,5 +0,0 @@
-{
-	"extends": "stylelint-config-standard",
-	"font-family-name-quotes": "double-where-recommended",
-	"block-no-empty": false
-}

.stylelintrc.json

@@ -0,0 +1,7 @@
+{
+	"extends": ["stylelint-prettier/recommended"],
+	"plugins": ["stylelint-prettier"],
+	"rules": {
+		"prettier/prettier": true
+	}
+}

.travis.yml

@@ -1,20 +1,25 @@
+dist: trusty
 language: node_js
 node_js:
- - "8"
- - "7"
- - "6"
- - "5.1"
+  - 10
+  - lts/*
+  - node
+before_install:
+  - npm i -g npm
 before_script:
- - npm install grunt-cli -g
- - "export DISPLAY=:99.0"
- - "sh -e /etc/init.d/xvfb start"
- - sleep 5
+  - yarn danger ci
+  - "export DISPLAY=:99.0"
+  - "export ELECTRON_DISABLE_SANDBOX=1"
+  - "sh -e /etc/init.d/xvfb start"
+  - sleep 5
 script:
-- grunt
-- npm run test:unit
-- npm run test:e2e
+  - npm run test:prettier
+  - npm run test:js
+  - npm run test:css
+  - npm run test:e2e
+  - npm run test:unit
 after_script:
- - npm list
+  - npm list
 cache:
- directories:
-  - node_modules
+  directories:
+    - node_modules

CHANGELOG.md

@@ -1,7 +1,453 @@
 # MagicMirror² Change Log
-All notable changes to this project will be documented in this file.
-This project adheres to [Semantic Versioning](http://semver.org/).
 
+All notable changes to this project will be documented in this file.
+This project adheres to [Semantic Versioning](https://semver.org/).
+
+❤️ **Donate:** Enjoying MagicMirror²? [Please consider a donation!](https://magicmirror.builders/donate) With your help we can continue to improve the MagicMirror²
+
+## [2.12.0] - 2020-07-01
+
+Special thanks to the following contributors: @AndreKoepke, @andrezibaia, @bryanzzhu, @chamakura, @DarthBrento, @Ekristoffe, @khassel, @Legion2, @ndom91, @radokristof, @rejas, @XBCreepinJesus & @ZoneMR.
+
+ℹ️ **Note:** This update uses new dependencies. Please update using the following command: `git pull && npm install`.
+
+### Added
+
+- Added option to config the level of logging.
+- Added prettier for an even cleaner codebase.
+- Hide Sunrise/Sunset in Weather module.
+- Hide Sunrise/Sunset in Current Weather module.
+- Added Met Office DataHub (UK) provider.
+
+### Updated
+
+- Cleaned up alert module code.
+- Cleaned up check_config code.
+- Replaced grunt-based linters with their non-grunt equivalents.
+- Switch to most of the eslint:recommended rules and fix warnings.
+- Replaced insecure links with https ones.
+- Cleaned up all "no-undef" warnings from eslint.
+- Added location title wrapping for calendar module.
+- Updated the BG translation.
+
+### Deleted
+
+- Removed truetype (ttf) fonts.
+
+### Fixed
+
+- The broken modules due to Socket.io change from last release. [#1973](https://github.com/MichMich/MagicMirror/issues/1973)
+- Add backward compatibility for old module code in socketclient.js. [#1973](https://github.com/MichMich/MagicMirror/issues/1973)
+- Support multiple instances of calendar module with different config. [#1109](https://github.com/MichMich/MagicMirror/issues/1109)
+- Fix the use of "maxNumberOfDays" in the module "weatherforecast". [#2018](https://github.com/MichMich/MagicMirror/issues/2018)
+- Throw error when check_config fails. [#1928](https://github.com/MichMich/MagicMirror/issues/1928)
+- Bug fix related to 'maxEntries' not displaying Calendar events. [#2050](https://github.com/MichMich/MagicMirror/issues/2050)
+- Updated ical library to latest version. [#1926](https://github.com/MichMich/MagicMirror/issues/1926)
+
+## [2.11.0] - 2020-04-01
+
+🚨 READ THIS BEFORE UPDATING 🚨
+
+In the past years the project has grown a lot. This came with a huge downside: poor maintainability. If I let the project continue the way it was, it would eventually crash and burn. More important: I would completely lose the drive and interest to continue the project. Because of this the decision was made to simplify the core by removing all side features like automatic installers and support for exotic platforms. This release (2.11.0) is the first real release that will reflect (parts) of these changes. As a result of this, some things might break. So before you continue make sure to backup your installation. Your config, your modules or better yet: your full MagicMirror folder. In other words: update at your own risk.
+
+For more information regarding this major change, please check issue [#1860](https://github.com/MichMich/MagicMirror/issues/1860).
+
+### Deleted
+
+- Remove installers.
+- Remove externalized scripts.
+- Remove jshint dependency, instead eslint checks your config file now
+
+### Added
+
+- Brazilian translation for "FEELS".
+- Ukrainian translation.
+- Finnish translation for "PRECIP", "UPDATE_INFO_MULTIPLE" and "UPDATE_INFO_SINGLE".
+- Added the ability to hide the temp label and weather icon in the `currentweather` module to allow showing only information such as wind and sunset/rise.
+- The `clock` module now optionally displays sun and moon data, including rise/set times, remaining daylight, and percent of moon illumination.
+- Added Hebrew translation.
+- Add HTTPS support and update config.js.sample
+- Run tests on long term support and latest stable version of nodejs
+- Added the ability to configure a list of modules that shouldn't be update checked.
+- Run linters on git commits
+- Added date functionality to compliments: display birthday wishes or celebrate an anniversary
+- Add HTTPS support for clientonly-mode.
+
+### Fixed
+
+- Force declaration of public ip address in config file (ISSUE #1852)
+- Fixes `run-start.sh`: If running in docker-container, don't check the environment, just start electron (ISSUE #1859)
+- Fix calendar time offset for recurring events crossing Daylight Savings Time (ISSUE #1798)
+- Fix regression in currentweather module causing 'undefined' to show up when config.hideTemp is false
+- Fix FEELS translation for Croatian
+- Fixed weather tests [#1840](https://github.com/MichMich/MagicMirror/issues/1840)
+- Fixed Socket.io can't be used with Reverse Proxy in serveronly mode [#1934](https://github.com/MichMich/MagicMirror/issues/1934)
+- Fix update checking skipping 3rd party modules the first time
+
+### Changed
+
+- Remove documentation from core repository and link to new dedicated docs site: [docs.magicmirror.builders](https://docs.magicmirror.builders).
+- Updated config.js.sample: Corrected some grammar on `config.js.sample` comment section.
+- Removed `run-start.sh` script and update start commands:
+  - To start using electron, use `npm run start`.
+  - To start in server only mode, use `npm run server`.
+- Remove redundant logging from modules.
+- Timestamp in log output now also contains the date
+- Turkish translation.
+- Option to configure the size of the currentweather module.
+
+## [2.10.1] - 2020-01-10
+
+### Changed
+
+- Updated README.md: Added links to the official documentation website and remove links to broken installer.
+
+## [2.10.0] - 2020-01-01
+
+Special thanks to @sdetweil for all his great contributions!
+
+ℹ️ **Note:** This update uses new dependencies. Please update using the following command: `git pull && npm install`.
+
+### Added
+
+- Timestamps in log output.
+- Padding in dateheader mode of the calendar module.
+- New upgrade script to help users consume regular updates installers/upgrade-script.sh.
+- New script to help setup pm2, without install installers/fixuppm2.sh.
+
+### Updated
+
+- Updated lower bound of `lodash` and `helmet` dependencies for security patches.
+- Updated compliments.js to handle newline in text, as textfields to not interpolate contents.
+- Updated raspberry.sh installer script to handle new platform issues, split node/npm, pm2, and screen saver changes.
+- Improve handling for armv6l devices, where electron support has gone away, add optional serveronly config option.
+- Improved run-start.sh to handle for serveronly mode, by choice, or when electron not available.
+- Only check for xwindows running if not on macOS.
+
+### Fixed
+
+- Fixed issue in weatherforecast module where predicted amount of rain was not using the decimal symbol specified in config.js.
+- Module header now updates correctly, if a module need to dynamically show/hide its header based on a condition.
+- Fix handling of config.js for serverOnly mode commented out.
+- Fixed issue in calendar module where the debug script didn't work correctly with authentication.
+- Fixed issue that some full day events were not correctly recognized as such.
+- Display full day events lasting multiple days as happening today instead of some days ago if they are still ongoing.
+
+## [2.9.0] - 2019-10-01
+
+ℹ️ **Note:** This update uses new dependencies. Please update using the following command: `git pull && npm install`. If you are having issues running Electron, make sure your [Raspbian is up to date](https://www.raspberrypi.org/documentation/raspbian/updating.md).
+
+### Added
+
+- Spanish translation for "PRECIP".
+- Adding a Malay (Malaysian) translation for MagicMirror².
+- Add test check URLs of vendors 200 and 404 HTTP CODE.
+- Add tests for new weather module and helper to stub ajax requests.
+
+### Updated
+
+- Updatenotification module: Display update notification for a limited (configurable) time.
+- Enabled e2e/vendor_spec.js tests.
+- The css/custom.css will be renamed after the next release. We've added into `run-start.sh` an instruction by GIT to ignore with `--skip-worktree` and `rm --cached`. [#1540](https://github.com/MichMich/MagicMirror/issues/1540)
+- Disable sending of notification CLOCK_SECOND when displaySeconds is false.
+
+### Fixed
+
+- Updatenotification module: Properly handle race conditions, prevent crash.
+- Send `NEWS_FEED` notification also for the first news messages which are shown.
+- Fixed issue where weather module would not refresh data after a network or API outage. [#1722](https://github.com/MichMich/MagicMirror/issues/1722)
+- Fixed weatherforecast module not displaying rain amount on fallback endpoint.
+- Notifications CLOCK_SECOND & CLOCK_MINUTE being from startup instead of matched against the clock and avoid drifting.
+
+## [2.8.0] - 2019-07-01
+
+ℹ️ **Note:** This update uses new dependencies. Please update using the following command: `git pull && npm install`. If you are having issues running Electron, make sure your [Raspbian is up to date](https://www.raspberrypi.org/documentation/raspbian/updating.md).
+
+### Added
+
+- Option to show event location in calendar
+- Finnish translation for "Feels" and "Weeks"
+- Russian translation for “Feels”
+- Calendar module: added `nextDaysRelative` config option
+- Add `broadcastPastEvents` config option for calendars to include events from the past `maximumNumberOfDays` in event broadcasts
+- Added feature to broadcast news feed items `NEWS_FEED` and updated news items `NEWS_FEED_UPDATED` in default [newsfeed](https://github.com/MichMich/MagicMirror/tree/develop/modules/default/newsfeed) module (when news is updated) with documented default and `config.js` options in [README.md](https://github.com/MichMich/MagicMirror/blob/develop/modules/default/newsfeed/README.md)
+- Added notifications to default `clock` module broadcasting `CLOCK_SECOND` and `CLOCK_MINUTE` for the respective time elapsed.
+- Added UK Met Office Datapoint feed as a provider in the default weather module.
+- Added new provider class
+- Added suncalc.js dependency to calculate sun times (not provided in UK Met Office feed)
+- Added "tempUnits" and "windUnits" to allow, for example, temp in metric (i.e. celsius) and wind in imperial (i.e. mph). These will override "units" if specified, otherwise the "units" value will be used.
+- Use Feels Like temp from feed if present
+- Optionally display probability of precipitation (PoP) in current weather (UK Met Office data)
+- Automatically try to fix eslint errors by passing `--fix` option to it
+- Added sunrise and sunset times to weathergov weather provider [#1705](https://github.com/MichMich/MagicMirror/issues/1705)
+- Added "useLocationAsHeader" to display "location" in `config.js` as header when location name is not returned
+- Added to `newsfeed.js`: in order to design the news article better with css, three more class-names were introduced: newsfeed-desc, newsfeed-desc, newsfeed-desc
+
+### Updated
+
+- English translation for "Feels" to "Feels like"
+- Fixed the example calendar url in `config.js.sample`
+- Update `ical.js` to solve various calendar issues.
+- Update weather city list url [#1676](https://github.com/MichMich/MagicMirror/issues/1676)
+- Only update clock once per minute when seconds aren't shown
+
+### Fixed
+
+- Fixed uncaught exception, race condition on module update
+- Fixed issue [#1696](https://github.com/MichMich/MagicMirror/issues/1696), some ical files start date to not parse to date type
+- Allowance HTML5 autoplay-policy (policy is changed from Chrome 66 updates)
+- Handle SIGTERM messages
+- Fixes sliceMultiDayEvents so it respects maximumNumberOfDays
+- Minor types in default NewsFeed [README.md](https://github.com/MichMich/MagicMirror/blob/develop/modules/default/newsfeed/README.md)
+- Fix typos and small syntax errors, cleanup dependencies, remove multiple-empty-lines, add semi-rule
+- Fixed issues with calendar not displaying one-time changes to repeating events
+- Updated the fetchedLocationName variable in currentweather.js so that city shows up in the header
+
+### Updated installer
+
+- give non-pi2+ users (pi0, odroid, jetson nano, mac, windows, ...) option to continue install
+- use current username vs hardcoded 'pi' to support non-pi install
+- check for npm installed. node install doesn't do npm anymore
+- check for mac as part of PM2 install, add install option string
+- update pm2 config with current username instead of hard coded 'pi'
+- check for screen saver config, "/etc/xdg/lxsession", bypass if not setup
+
+## [2.7.1] - 2019-04-02
+
+Fixed `package.json` version number.
+
+## [2.7.0] - 2019-04-01
+
+ℹ️ **Note:** This update uses new dependencies. Please update using the following command: `git pull && npm install`. If you are having issues running Electron, make sure your [Raspbian is up to date](https://www.raspberrypi.org/documentation/raspbian/updating.md).
+
+### Added
+
+- Italian translation for "Feels"
+- Basic Klingon (tlhIngan Hol) translations
+- Disabled the screensaver on raspbian with installation script
+- Added option to truncate the number of vertical lines a calendar item can span if `wrapEvents` is enabled.
+- Danish translation for "Feels" and "Weeks"
+- Added option to split multiple day events in calendar to separate numbered events
+- Slovakian translation
+- Alerts now can contain Font Awesome icons
+- Notifications display time can be set in request
+- Newsfeed: added support for `ARTICLE_INFO_REQUEST` notification
+- Add `name` config option for calendars to be sent along with event broadcasts
+
+### Updated
+
+- Bumped the Electron dependency to v3.0.13 to support the most recent Raspbian. [#1500](https://github.com/MichMich/MagicMirror/issues/1500)
+- Updated modernizr code in alert module, fixed a small typo there too
+- More verbose error message on console if the config is malformed
+- Updated installer script to install Node.js version 10.x
+
+### Fixed
+
+- Fixed temperature displays in currentweather and weatherforecast modules [#1503](https://github.com/MichMich/MagicMirror/issues/1503), [#1511](https://github.com/MichMich/MagicMirror/issues/1511).
+- Fixed unhandled error on bad git data in updatenotification module [#1285](https://github.com/MichMich/MagicMirror/issues/1285).
+- Weather forecast now works with openweathermap in new weather module. Daily data are displayed, see issue [#1504](https://github.com/MichMich/MagicMirror/issues/1504).
+- Fixed analogue clock border display issue where non-black backgrounds used (previous fix for issue 611)
+- Fixed compatibility issues caused when modules request different versions of Font Awesome, see issue [#1522](https://github.com/MichMich/MagicMirror/issues/1522). MagicMirror now uses [Font Awesome 5 with v4 shims included for backwards compatibility](https://fontawesome.com/how-to-use/on-the-web/setup/upgrading-from-version-4#shims).
+- Installation script problems with raspbian
+- Calendar: only show repeating count if the event is actually repeating [#1534](https://github.com/MichMich/MagicMirror/pull/1534)
+- Calendar: Fix exdate handling when multiple values are specified (comma separated)
+- Calendar: Fix relative date handling for fulldate events, calculate difference always from start of day [#1572](https://github.com/MichMich/MagicMirror/issues/1572)
+- Fix null dereference in moduleNeedsUpdate when the module isn't visible
+- Calendar: Fixed event end times by setting default calendarEndTime to "LT" (Local time format). [#1479]
+- Calendar: Fixed missing calendar fetchers after server process restarts [#1589](https://github.com/MichMich/MagicMirror/issues/1589)
+- Notification: fixed background color (was white text on white background)
+- Use getHeader instead of data.header when creating the DOM so overwriting the function also propagates into it
+- Fix documentation of `useKMPHwind` option in currentweather
+
+### New weather module
+
+- Fixed weather forecast table display [#1499](https://github.com/MichMich/MagicMirror/issues/1499).
+- Dimmed loading indicator for weather forecast.
+- Implemented config option `decimalSymbol` [#1499](https://github.com/MichMich/MagicMirror/issues/1499).
+- Aligned indoor values in current weather vertical [#1499](https://github.com/MichMich/MagicMirror/issues/1499).
+- Added humidity support to nunjuck unit filter.
+- Do not display degree symbol for temperature in Kelvin [#1503](https://github.com/MichMich/MagicMirror/issues/1503).
+- Weather forecast now works with openweathermap for both, `/forecast` and `/forecast/daily`, in new weather module. If you use the `/forecast`-weatherEndpoint, the hourly data are converted to daily data, see issues [#1504](https://github.com/MichMich/MagicMirror/issues/1504), [#1513](https://github.com/MichMich/MagicMirror/issues/1513).
+- Added fade, fadePoint and maxNumberOfDays properties to the forecast mode [#1516](https://github.com/MichMich/MagicMirror/issues/1516)
+- Fixed Loading string and decimalSymbol string replace [#1538](https://github.com/MichMich/MagicMirror/issues/1538)
+- Show Snow amounts in new weather module [#1545](https://github.com/MichMich/MagicMirror/issues/1545)
+- Added weather.gov as a new weather provider for US locations
+
+## [2.6.0] - 2019-01-01
+
+ℹ️ **Note:** This update uses new dependencies. Please update using the following command: `git pull && npm install`. If you are having issues updating, make sure you are running the latest version of Node.
+
+### ✨ Experimental ✨
+
+- New default [module weather](modules/default/weather). This module will eventually replace the current `currentweather` and `weatherforecast` modules. The new module is still pretty experimental, but it's included so you can give it a try and help us improve this module. Please give us you feedback using [this forum post](https://forum.magicmirror.builders/topic/9335/default-weather-module-refactoring).
+
+A huge, huge, huge thanks to user @fewieden for all his hard work on the new `weather` module!
+
+### Added
+
+- Possibility to add classes to the cell of symbol, title and time of the events of calendar.
+- Font-awesome 5, still has 4 for backwards compatibility.
+- Missing `showEnd` in calendar documentation
+- Screenshot for the new feed module
+- Screenshot for the compliments module
+- Screenshot for the clock module
+- Screenshot for the current weather
+- Screenshot for the weather forecast module
+- Portuguese translation for "Feels"
+- Croatian translation
+- Fading for dateheaders timeFormat in Calendar [#1464](https://github.com/MichMich/MagicMirror/issues/1464)
+- Documentation for the existing `scale` option in the Weather Forecast module.
+
+### Fixed
+
+- Allow parsing recurring calendar events where the start date is before 1900
+- Fixed Polish translation for Single Update Info
+- Ignore entries with unparseable details in the calendar module
+- Bug showing FullDayEvents one day too long in calendar fixed
+- Bug in newsfeed when `removeStartTags` is used on the description [#1478](https://github.com/MichMich/MagicMirror/issues/1478)
+
+### Updated
+
+- The default calendar setting `showEnd` is changed to `false`.
+
+### Changed
+
+- The Weather Forecast module by default displays the ° symbol after every numeric value to be consistent with the Current Weather module.
+
+## [2.5.0] - 2018-10-01
+
+### Added
+
+- Romanian translation for "Feels"
+- Support multi-line compliments
+- Simplified Chinese translation for "Feels"
+- Polish translate for "Feels"
+- French translate for "Feels"
+- Translations for newsfeed module
+- Support for toggling news article in fullscreen
+- Hungarian translation for "Feels" and "Week"
+- Spanish translation for "Feels"
+- Add classes instead of inline style to the message from the module Alert
+- Support for events having a duration instead of an end
+- Support for showing end of events through config parameters showEnd and dateEndFormat
+
+### Fixed
+
+- Fixed gzip encoded calendar loading issue #1400.
+- Mixup between german and spanish translation for newsfeed.
+- Fixed close dates to be absolute, if no configured in the config.js - module Calendar
+- Fixed the updatenotification module message about new commits in the repository, so they can be correctly localized in singular and plural form.
+- Fix for weatherforecast rainfall rounding [#1374](https://github.com/MichMich/MagicMirror/issues/1374)
+- Fix calendar parsing issue for Midori on RasperryPi Zero w, related to issue #694.
+- Fix weather city ID link in sample config
+- Fixed issue with clientonly not updating with IP address and port provided on command line.
+
+### Updated
+
+- Updated Simplified Chinese translation
+- Swedish translations
+- Hungarian translations for the updatenotification module
+- Updated Norsk bokmål translation
+- Updated Norsk nynorsk translation
+- Consider multi days event as full day events
+
+## [2.4.1] - 2018-07-04
+
+### Fixed
+
+- Fix weather parsing issue #1332.
+
+## [2.4.0] - 2018-07-01
+
+⚠️ **Warning:** This release includes an updated version of Electron. This requires a Raspberry Pi configuration change to allow the best performance and prevent the CPU from overheating. Please read the information on the [MagicMirror Wiki](https://github.com/michmich/magicmirror/wiki/configuring-the-raspberry-pi#enable-the-open-gl-driver-to-decrease-electrons-cpu-usage).
+
+ℹ️ **Note:** This update uses new dependencies. Please update using the following command: `git pull && npm install`
+
+### Added
+
+- Enabled translation of feelsLike for module currentweather
+- Added support for on-going calendar events
+- Added scroll up in fullscreen newsfeed article view
+- Changed fullscreen newsfeed width from 100% to 100vw (better results)
+- Added option to calendar module that colors only the symbol instead of the whole line
+- Added option for new display format in the calendar module with date headers with times/events below.
+- Ability to fetch compliments from a remote server
+- Add regex filtering to calendar module
+- Customize classes for table
+- Added option to newsfeed module to only log error parsing a news article if enabled
+- Add update translations for Português Brasileiro
+
+### Changed
+
+- Upgrade to Electron 2.0.0.
+- Remove yarn-or-npm which breaks production builds.
+- Invoke module suspend even if no dom content. [#1308](https://github.com/MichMich/MagicMirror/issues/1308)
+
+### Fixed
+
+- Fixed issue where wind chill could not be displayed in Fahrenheit. [#1247](https://github.com/MichMich/MagicMirror/issues/1247)
+- Fixed issues where a module crashes when it tries to dismiss a non existing alert. [#1240](https://github.com/MichMich/MagicMirror/issues/1240)
+- In default module currentWeather/currentWeather.js line 296, 300, self.config.animationSpeed can not be found because the notificationReceived function does not have "self" variable.
+- Fixed browser-side code to work on the Midori browser.
+- Fixed issue where heat index was reporting incorrect values in Celsius and Fahrenheit. [#1263](https://github.com/MichMich/MagicMirror/issues/1263)
+- Fixed weatherforecast to use dt_txt field instead of dt to handle timezones better
+- Newsfeed now remembers to show the description when `"ARTICLE_LESS_DETAILS"` is called if the user wants to always show the description. [#1282](https://github.com/MichMich/MagicMirror/issues/1282)
+- `clientonly/*.js` is now linted, and one linting error is fixed
+- Fix issue #1196 by changing underscore to hyphen in locale id, in align with momentjs.
+- Fixed issue where heat index and wind chill were reporting incorrect values in Kelvin. [#1263](https://github.com/MichMich/MagicMirror/issues/1263)
+
+### Updated
+
+- Updated Italian translation
+- Updated German translation
+- Updated Dutch translation
+
+## [2.3.1] - 2018-04-01
+
+### Fixed
+
+- Downgrade electron to 1.4.15 to solve the black screen issue.[#1243](https://github.com/MichMich/MagicMirror/issues/1243)
+
+## [2.3.0] - 2018-04-01
+
+### Added
+
+- Add new settings in compliments module: setting time intervals for morning and afternoon
+- Add system notification `MODULE_DOM_CREATED` for notifying each module when their Dom has been fully loaded.
+- Add types for module.
+- Implement Danger.js to notify contributors when CHANGELOG.md is missing in PR.
+- Allow scrolling in full page article view of default newsfeed module with gesture events from [MMM-Gestures](https://github.com/thobach/MMM-Gestures)
+- Changed 'compliments.js' - update DOM if remote compliments are loaded instead of waiting one updateInterval to show custom compliments
+- Automated unit tests utils, deprecated, translator, cloneObject(lockstrings)
+- Automated integration tests translations
+- Add advanced filtering to the excludedEvents configuration of the default calendar module
+- New currentweather module config option: `showFeelsLike`: Shows how it actually feels like. (wind chill or heat index)
+- New currentweather module config option: `useKMPHwind`: adds an option to see wind speed in Kmph instead of just m/s or Beaufort.
+- Add dc:date to parsing in newsfeed module, which allows parsing of more rss feeds.
+
+### Changed
+
+- Add link to GitHub repository which contains the respective Dockerfile.
+- Optimized automated unit tests cloneObject, cmpVersions
+- Update notifications use now translation templates instead of normal strings.
+- Yarn can be used now as an installation tool
+- Changed Electron dependency to v1.7.13.
+
+### Fixed
+
+- News article in fullscreen (iframe) is now shown in front of modules.
+- Forecast respects maxNumberOfDays regardless of endpoint.
+- Fix exception on translation of objects.
+
+## [2.2.2] - 2018-01-02
+
+### Added
+
+- Add missing `package-lock.json`.
+
+### Changed
+
+- Changed Electron dependency to v1.7.10.
 
 ## [2.2.1] - 2018-01-01
 
@@ -14,10 +460,12 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 **Note:** This update uses new dependencies. Please update using the following command: `git pull && npm install`
 
 ### Changed
-- Calender week is now handled with a variable translation in order to move number language specific.
+
+- Calendar week is now handled with a variable translation in order to move number language specific.
 - Reverted the Electron dependency back to 1.4.15 since newer version don't seem to work on the Raspberry Pi very well.
 
 ### Added
+
 - Add option to use [Nunjucks](https://mozilla.github.io/nunjucks/) templates in modules. (See `helloworld` module as an example.)
 - Add Bulgarian translations for MagicMirror² and Alert module.
 - Add graceful shutdown of modules by calling `stop` function of each `node_helper` on SIGINT before exiting.
@@ -31,6 +479,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Add option for decimal symbols other than the decimal point for temperature values in both default weather modules: WeatherForecast and CurrentWeather.
 
 ### Fixed
+
 - Fixed issue with calendar module showing more than `maximumEntries` allows
 - WeatherForecast and CurrentWeather are now using HTTPS instead of HTTP
 - Correcting translation for Indonesian language
@@ -41,13 +490,15 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 **Note:** This update uses new dependencies. Please update using the following command: `git pull && npm install`
 
 ### Changed
+
 - Remove Roboto fonts files inside `fonts` and these are installed by npm install command.
 
 ### Added
+
 - Add `clientonly` script to start only the electron client for a remote server.
 - Add symbol and color properties of event when `CALENDAR_EVENTS` notification is broadcasted from `default/calendar` module.
 - Add `.vscode/` folder to `.gitignore` to keep custom Visual Studio Code config out of git.
-- Add unit test the capitalizeFirstLetter function of newfeed module.
+- Add unit test the capitalizeFirstLetter function of newsfeed module.
 - Add new unit tests for function `shorten` in calendar module.
 - Add new unit tests for function `getLocaleSpecification` in calendar module.
 - Add unit test for js/class.js.
@@ -60,6 +511,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Add Slack badge to Readme.
 
 ### Updated
+
 - Changed 'default.js' - listen on all attached interfaces by default.
 - Add execution of `npm list` after the test are ran in Travis CI.
 - Change hooks for the vendors e2e tests.
@@ -68,7 +520,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Set version of the `express-ipfilter` on 0.3.1.
 
 ### Fixed
-- Fixed issue with incorrect allignment of analog clock when displayed in the center column of the MM.
+
+- Fixed issue with incorrect alignment of analog clock when displayed in the center column of the MM.
 - Fixed ipWhitelist behaviour to make empty whitelist ([]) allow any and all hosts access to the MM.
 - Fixed issue with calendar module where 'excludedEvents' count towards 'maximumEntries'.
 - Fixed issue with calendar module where global configuration of maximumEntries was not overridden by calendar specific config (see module doc).
@@ -78,11 +531,13 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ## [2.1.2] - 2017-07-01
 
 ### Changed
+
 - Revert Docker related changes in favor of [docker-MagicMirror](https://github.com/bastilimbach/docker-MagicMirror). All Docker images are outsourced. ([#856](https://github.com/MichMich/MagicMirror/pull/856))
 - Change Docker base image (Debian + Node) to an arm based distro (AlpineARM + Node) ([#846](https://github.com/MichMich/MagicMirror/pull/846))
 - Fix the dockerfile to have it running from the first time.
 
 ### Added
+
 - Add in option to wrap long calendar events to multiple lines using `wrapEvents` configuration option.
 - Add test e2e `show title newsfeed` for newsfeed module.
 - Add task to check configuration file.
@@ -92,7 +547,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Add unit test calendar_modules function capFirst.
 - Add test for check if exists the directories present in defaults modules.
 - Add support for showing wind direction as an arrow instead of abbreviation in currentWeather module.
-- Add support for writing translation fucntions to support flexible word order
+- Add support for writing translation functions to support flexible word order
 - Add test for check if exits the directories present in defaults modules.
 - Add calendar option to set a separate date format for full day events.
 - Add ability for `currentweather` module to display indoor temperature via INDOOR_TEMPERATURE notification
@@ -101,17 +556,19 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Added Romanian translation.
 
 ### Updated
+
 - Added missing keys to Polish translation.
 - Added missing key to German translation.
 - Added better translation with flexible word order to Finnish translation.
 
 ### Fixed
+
 - Fix instruction in README for using automatically installer script.
 - Bug of duplicated compliments as described in [here](https://forum.magicmirror.builders/topic/2381/compliments-module-stops-cycling-compliments).
 - Fix double message about port when server is starting
 - Corrected Swedish translations for TODAY/TOMORROW/DAYAFTERTOMORROW.
 - Removed unused import from js/electron.js
-- Made calendar.js respect config.timeFormat irrespecive of locale setting.
+- Made calendar.js respect config.timeFormat irrespective of locale setting.
 - Fixed alignment of analog clock when a large calendar is displayed in the same side bar.
 
 ## [2.1.1] - 2017-04-01
@@ -119,6 +576,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 **Note:** This update uses new dependencies. Please update using the following command: `git pull && npm install`
 
 ### Changed
+
 - Add `anytime` group for Compliments module.
 - Compliments module can use remoteFile without default daytime arrays defined.
 - Installer: Use init config.js from config.js.sample.
@@ -129,13 +587,14 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Added `DAYAFTERTOMORROW`, `UPDATE_NOTIFICATION` and `UPDATE_NOTIFICATION_MODULE` to Finnish translations.
 - Run `npm test` on Travis automatically.
 - Show the splash screen image even when is reboot or halted.
-- Added some missing translaton strings in the sv.json file.
+- Added some missing translation strings in the sv.json file.
 - Run task jsonlint to check translation files.
 - Restructured Test Suite.
 
 ### Added
+
 - Added Docker support (Pull Request [#673](https://github.com/MichMich/MagicMirror/pull/673)).
-- Calendar-specific support for `maximumEntries`, and ` maximumNumberOfDays`.
+- Calendar-specific support for `maximumEntries`, and `maximumNumberOfDays`.
 - Add loaded function to modules, providing an async callback.
 - Made default newsfeed module aware of gesture events from [MMM-Gestures](https://github.com/thobach/MMM-Gestures)
 - Add use pm2 for manager process into Installer RaspberryPi script.
@@ -146,12 +605,12 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Option to use RegExp in Calendar's titleReplace.
 - Hungarian Translation.
 - Icelandic Translation.
-- Add use a script to prevent when is run by SSH session set DISPLAY enviroment.
-- Enable ability to set configuration file by the enviroment variable called MM_CONFIG_FILE.
+- Add use a script to prevent when is run by SSH session set DISPLAY environment.
+- Enable ability to set configuration file by the environment variable called MM_CONFIG_FILE.
 - Option to give each calendar a different color.
 - Option for colored min-temp and max-temp.
 - Add test e2e helloworld.
-- Add test e2e enviroment.
+- Add test e2e environment.
 - Add `chai-as-promised` npm module to devDependencies.
 - Basic set of tests for clock module.
 - Run e2e test in Travis.
@@ -169,22 +628,23 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Added tests for Translations, dev argument, version, dev console.
 - Added test anytime feature compliments module.
 - Added test ipwhitelist configuration directive.
-- Added test for calendar module: default, basic-auth, backward compability, fail-basic-auth.
+- Added test for calendar module: default, basic-auth, backward compatibility, fail-basic-auth.
 - Added meta tags to support fullscreen mode on iOS (for server mode)
 - Added `ignoreOldItems` and `ignoreOlderThan` options to the News Feed module
-- Added test for MM_PORT enviroment variable.
+- Added test for MM_PORT environment variable.
 - Added a configurable Week section to the clock module.
 
 ### Fixed
+
 - Update .gitignore to not ignore default modules folder.
 - Remove white flash on boot up.
 - Added `update` in Raspberry Pi installation script.
 - Fix an issue where the analog clock looked scrambled. ([#611](https://github.com/MichMich/MagicMirror/issues/611))
-- If units is set to imperial, the showRainAmount option of weatherforecast will show the correct unit.
+- If units are set to imperial, the showRainAmount option of weatherforecast will show the correct unit.
 - Module currentWeather: check if temperature received from api is defined.
 - Fix an issue with module hidden status changing to `true` although lock string prevented showing it.
 - Fix newsfeed module bug (removeStartTags)
-- Fix when is set MM_PORT enviroment variable.
+- Fix when is set MM_PORT environment variable.
 - Fixed missing animation on `this.show(speed)` when module is alone in a region.
 
 ## [2.1.0] - 2016-12-31
@@ -192,6 +652,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 **Note:** This update uses new dependencies. Please update using the following command: `git pull && npm install`
 
 ### Added
+
 - Finnish translation.
 - Danish translation.
 - Turkish translation.
@@ -204,24 +665,25 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Module API: Method to overwrite the module's header. [See documentation](https://github.com/MichMich/MagicMirror/tree/develop/modules#getheader) for more information.
 - Module API: Option to define the minimum MagicMirror version to run a module. [See documentation](https://github.com/MichMich/MagicMirror/tree/develop/modules#requiresversion) for more information.
 - Calendar module now broadcasts the event list to all other modules using the notification system. [See documentation](https://github.com/MichMich/MagicMirror/tree/develop/modules/default/calendar) for more information.
-- Possibility to use the the calendar feed as the source for the weather (currentweather & weatherforecast) location data. [See documentation](https://github.com/MichMich/MagicMirror/tree/develop/modules/default/weatherforecast) for more information.
+- Possibility to use the calendar feed as the source for the weather (currentweather & weatherforecast) location data. [See documentation](https://github.com/MichMich/MagicMirror/tree/develop/modules/default/weatherforecast) for more information.
 - Added option to show rain amount in the weatherforecast default module
-- Add module `updatenotification` to get an update whenever a new version is availabe. [See documentation](https://github.com/MichMich/MagicMirror/tree/develop/modules/default/updatenotification) for more information.
-- Add the abilty to set timezone on the date display in the Clock Module
+- Add module `updatenotification` to get an update whenever a new version is available. [See documentation](https://github.com/MichMich/MagicMirror/tree/develop/modules/default/updatenotification) for more information.
+- Add the ability to set timezone on the date display in the Clock Module
 - Ability to set date format in calendar module
 - Possibility to use currentweather for the compliments
 - Added option `disabled` for modules.
 - Added option `address` to set bind address.
-- Added option `onlyTemp` for currentweather module to show show only current temperature and weather icon.
+- Added option `onlyTemp` for currentweather module to show only current temperature and weather icon.
 - Added option `remoteFile` to compliments module to load compliment array from filesystem.
 - Added option `zoom` to scale the whole mirror display with a given factor.
 - Added option `roundTemp` for currentweather and weatherforecast modules to display temperatures rounded to nearest integer.
-- Added abilty set the classes option to compliments module for style and text size of compliments.
+- Added ability set the classes option to compliments module for style and text size of compliments.
 - Added ability to configure electronOptions
 - Calendar module: option to hide private events
 - Add root_path for global vars
 
 ### Updated
+
 - Modified translations for Frysk.
 - Modified core English translations.
 - Updated package.json as a result of Snyk security update.
@@ -232,6 +694,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Modules are now secure, and Helmet is now used to prevent abuse of the Mirror's API.
 
 ### Fixed
+
 - Solve an issue where module margins would appear when the first module of a section was hidden.
 - Solved visual display errors on chrome, if all modules in one of the right sections are hidden.
 - Global and Module default config values are no longer modified when setting config values.
@@ -242,18 +705,21 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ## [2.0.5] - 2016-09-20
 
 ### Added
+
 - Added ability to remove tags from the beginning or end of newsfeed items in 'newsfeed.js'.
 - Added ability to define "the day after tomorrow" for calendar events (Definition for German and Dutch already included).
 - Added CII Badge (we are compliant with the CII Best Practices)
 - Add support for doing http basic auth when loading calendars
-- Add the abilty to turn off and on the date display in the Clock Module
+- Add the ability to turn off and on the date display in the Clock Module
 
 ### Fixed
+
 - Fix typo in installer.
 - Add message to unsupported Pi error to mention that Pi Zeros must use server only mode, as ARMv6 is unsupported. Closes #374.
 - Fix API url for weather API.
 
 ### Updated
+
 - Force fullscreen when kioskmode is active.
 - Update the .github templates and information with more modern information.
 - Update the Gruntfile with a more functional StyleLint implementation.
@@ -261,6 +727,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ## [2.0.4] - 2016-08-07
 
 ### Added
+
 - Brazilian Portuguese Translation.
 - Option to enable Kiosk mode.
 - Added ability to start the app with Dev Tools.
@@ -268,63 +735,81 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Greek Translation
 
 ### Fixed
+
 - Prevent `getModules()` selectors from returning duplicate entries.
-- Append endpoints of weather modules with `/` to retreive the correct data. (Issue [#337](https://github.com/MichMich/MagicMirror/issues/337))
-- Corrected grammer in `module.js` from 'suspend' to 'suspended'.
+- Append endpoints of weather modules with `/` to retrieve the correct data. (Issue [#337](https://github.com/MichMich/MagicMirror/issues/337))
+- Corrected grammar in `module.js` from 'suspend' to 'suspended'.
 - Fixed openweathermap.org URL in config sample.
 - Prevent currentweather module from crashing when received data object is incorrect.
 - Fix issue where translation loading prevented the UI start-up when the language was set to 'en'. (Issue [#388](https://github.com/MichMich/MagicMirror/issues/388))
 
 ### Updated
+
 - Updated package.json to fix possible vulnerabilities. (Using Snyk)
 - Updated weathericons
 - Updated default weatherforecast to work with the new icons.
 - More detailed error message in case config file couldn't be loaded.
 
 ## [2.0.3] - 2016-07-12
+
 ### Added
+
 - Add max newsitems parameter to the newsfeed module.
 - Translations for Simplified Chinese, Traditional Chinese and Japanese.
 - Polish Translation
 - Add an analog clock in addition to the digital one.
 
 ### Fixed
+
 - Edit Alert Module to display title & message if they are provided in the notification (Issue [#300](https://github.com/MichMich/MagicMirror/issues/300))
 - Removed 'null' reference from updateModuleContent(). This fixes recent Edge and Internet Explorer browser displays (Issue [#319](https://github.com/MichMich/MagicMirror/issues/319))
 
 ### Changed
+
 - Added default string to calendar titleReplace.
 
 ## [2.0.2] - 2016-06-05
+
 ### Added
+
 - Norwegian Translations (nb and nn)
 - Portuguese Translation
 - Swedish Translation
 
 ### Fixed
+
 - Added reference to Italian Translation.
 - Added the missing NE translation to all languages. [#344](https://github.com/MichMich/MagicMirror/issues/344)
 - Added proper User-Agent string to calendar call.
 
 ### Changed
+
 - Add option to use locationID in weather modules.
 
 ## [2.0.1] - 2016-05-18
+
 ### Added
+
 - Changelog
 - Italian Translation
 
 ### Changed
+
 - Improve the installer by fetching the latest Node.js without any 3rd party interferences.
 
 ## [2.0.0] - 2016-05-03
+
 ### Initial release of MagicMirror²
+
 It includes (but is not limited to) the following features:
+
 - Modular system allowing 3rd party plugins.
 - An Node/Electron based application taking away the need for external servers or browsers.
 - A complete development API documentation.
 - Small cute fairies that kiss you while you sleep.
 
 ## [1.0.0] - 2014-02-16
+
 ### Initial release of MagicMirror.
-This was part of the blogpost: [http://michaelteeuw.nl/post/83916869600/magic-mirror-part-vi-production-of-the](http://michaelteeuw.nl/post/83916869600/magic-mirror-part-vi-production-of-the)
+
+This was part of the blogpost: [https://michaelteeuw.nl/post/83916869600/magic-mirror-part-vi-production-of-the](https://michaelteeuw.nl/post/83916869600/magic-mirror-part-vi-production-of-the)

Gruntfile.js

@@ -1,103 +0,0 @@
-module.exports = function(grunt) {
-	require("time-grunt")(grunt);
-	grunt.initConfig({
-		pkg: grunt.file.readJSON("package.json"),
-		eslint: {
-			options: {
-				configFile: ".eslintrc.json"
-			},
-			target: [
-				"js/*.js",
-				"modules/default/*.js",
-				"modules/default/*/*.js",
-				"serveronly/*.js",
-				"*.js",
-				"tests/**/*.js",
-				"!modules/default/alert/notificationFx.js",
-				"!modules/default/alert/modernizr.custom.js",
-				"!modules/default/alert/classie.js",
-				"config/*",
-				"translations/translations.js",
-				"vendor/vendor.js",
-				"modules/node_modules/node_helper/index.js"
-			]
-		},
-		stylelint: {
-			simple: {
-				options: {
-					configFile: ".stylelintrc"
-				},
-				src: [
-					"css/main.css",
-					"modules/default/calendar/calendar.css",
-					"modules/default/clock/clock_styles.css",
-					"modules/default/currentweather/currentweather.css",
-					"modules/default/weatherforcast/weatherforcast.css"
-				]
-			}
-		},
-		jsonlint: {
-			main: {
-				src: [
-					"package.json",
-					".eslintrc.json",
-					".stylelintrc",
-					"translations/*.json",
-					"modules/default/*/translations/*.json",
-					"installers/pm2_MagicMirror.json",
-					"vendor/package.js"
-				],
-				options: {
-					reporter: "jshint"
-				}
-			}
-		},
-		markdownlint: {
-			all: {
-				options: {
-					config: {
-						"default": true,
-						"line-length": false,
-						"blanks-around-headers": false,
-						"no-duplicate-header": false,
-						"no-inline-html": false,
-						"MD010": false,
-						"MD001": false,
-						"MD031": false,
-						"MD040": false,
-						"MD002": false,
-						"MD029": false,
-						"MD041": false,
-						"MD032": false,
-						"MD036": false,
-						"MD037": false,
-						"MD009": false,
-						"MD018": false,
-						"MD012": false,
-						"MD026": false,
-						"MD038": false
-					}
-				},
-				src: [
-					"README.md",
-					"CHANGELOG.md",
-					"LICENSE.md",
-					"modules/README.md",
-					"modules/default/**/*.md",
-					"!modules/default/calendar/vendor/ical.js/readme.md"
-				]
-			}
-		},
-		yamllint: {
-			all: [
-				".travis.yml"
-			]
-		}
-	});
-	grunt.loadNpmTasks("grunt-eslint");
-	grunt.loadNpmTasks("grunt-stylelint");
-	grunt.loadNpmTasks("grunt-jsonlint");
-	grunt.loadNpmTasks("grunt-yamllint");
-	grunt.loadNpmTasks("grunt-markdownlint");
-	grunt.registerTask("default", ["eslint", "stylelint", "jsonlint", "markdownlint", "yamllint"]);
-};

LICENSE.md

@@ -1,7 +1,6 @@
-The MIT License (MIT)
-=====================
+# The MIT License (MIT)
 
-Copyright © 2016-2017 Michael Teeuw
+Copyright © 2016-2019 Michael Teeuw
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

README.md

@@ -4,181 +4,40 @@
 	<a href="https://david-dm.org/MichMich/MagicMirror"><img src="https://david-dm.org/MichMich/MagicMirror.svg" alt="Dependency Status"></a>
 	<a href="https://david-dm.org/MichMich/MagicMirror#info=devDependencies"><img src="https://david-dm.org/MichMich/MagicMirror/dev-status.svg" alt="devDependency Status"></a>
 	<a href="https://bestpractices.coreinfrastructure.org/projects/347"><img src="https://bestpractices.coreinfrastructure.org/projects/347/badge"></a>
-	<a href="http://choosealicense.com/licenses/mit"><img src="https://img.shields.io/badge/license-MIT-blue.svg" alt="License"></a>
-	<a href="https://travis-ci.org/MichMich/MagicMirror"><img src="https://travis-ci.org/MichMich/MagicMirror.svg" alt="Travis"></a>
+	<a href="https://choosealicense.com/licenses/mit"><img src="https://img.shields.io/badge/license-MIT-blue.svg" alt="License"></a>
+	<a href="https://travis-ci.com/MichMich/MagicMirror"><img src="https://travis-ci.com/MichMich/MagicMirror.svg" alt="Travis"></a>
 	<a href="https://snyk.io/test/github/MichMich/MagicMirror"><img src="https://snyk.io/test/github/MichMich/MagicMirror/badge.svg" alt="Known Vulnerabilities" data-canonical-src="https://snyk.io/test/github/MichMich/MagicMirror" style="max-width:100%;"></a>
-	<a href="http://slack.magicmirror.builders"><img src="http://slack.magicmirror.builders:3000/badge.svg" alt="Slack Status"></a>
 </p>
 
-**MagicMirror²** is an open source modular smart mirror platform. With a growing list of installable modules, the **MagicMirror²** allows you to convert your hallway or bathroom mirror into your personal assistant. **MagicMirror²** is built by the creator of [the original MagicMirror](http://michaelteeuw.nl/tagged/magicmirror) with the incredible help of a [growing community of contributors](https://github.com/MichMich/MagicMirror/graphs/contributors).
+**MagicMirror²** is an open source modular smart mirror platform. With a growing list of installable modules, the **MagicMirror²** allows you to convert your hallway or bathroom mirror into your personal assistant. **MagicMirror²** is built by the creator of [the original MagicMirror](https://michaelteeuw.nl/tagged/magicmirror) with the incredible help of a [growing community of contributors](https://github.com/MichMich/MagicMirror/graphs/contributors).
 
-MagicMirror² focuses on a modular plugin system and uses [Electron](http://electron.atom.io/) as an application wrapper. So no more web server or browser installs necessary!
+MagicMirror² focuses on a modular plugin system and uses [Electron](https://www.electronjs.org/) as an application wrapper. So no more web server or browser installs necessary!
 
-## Table Of Contents
+## Documentation
 
-- [Usage](#usage)
-- [Configuration](#configuration)
-- [Modules](#modules)
-- [Known Issues](#known-issues)
-- [Community](#community)
-- [Contributing Guidelines](#contributing-guidelines)
+For the full documentation including **[installation instructions](https://docs.magicmirror.builders/getting-started/installation.html)**, please visit our dedicated documentation website: [https://docs.magicmirror.builders](https://docs.magicmirror.builders).
 
-## Usage
+## Links
 
-### Raspberry Pi Support
-Electron, the app wrapper around MagicMirror², only supports the Raspberry Pi 2 & 3. The Raspberry Pi 1 is currently **not** supported. If you want to run this on a Raspberry Pi 1, use the [server only](#server-only) feature and setup a fullscreen browser yourself.
-
-### Automatic Installer (Raspberry Pi Only!)
-
-Execute the following command on your Raspberry Pi to install MagicMirror²:
-````
-bash -c "$(curl -sL https://raw.githubusercontent.com/MichMich/MagicMirror/master/installers/raspberry.sh)"
-````
-
-### Manual Installation
-
-1. Download and install the latest Node.js version.
-2. Clone the repository and check out the master branch: `git clone https://github.com/MichMich/MagicMirror`
-3. Enter the repository: `cd ~/MagicMirror`
-4. Install and run the app: `npm install && npm start`
-
-**Important:** `npm start` does **not** work via SSH, use `DISPLAY=:0 nohup npm start &` instead. This starts the mirror on the remote display.
-
-**Note:** if you want to debug on Raspberry Pi you can use `npm start dev` which will start the MagicMirror app with Dev Tools enabled.
-
-### Server Only
-In some cases, you want to start the application without an actual app window. In this case, you can start MagicMirror² in server only mode by manually running `node serveronly` or using Docker. This will start the server, after which you can open the application in your browser of choice. Detailed description below.
-
-### Client Only
-When you have a server running remotely and want to connect a standalone client to this instance, you can manually run `node clientonly --address 192.168.1.5 --port 8080`. (Specify the ip address and port number of the server)
-
-**Important:** Make sure that you whitelist the interface/ip in the server config where you want the client to connect to, otherwise it will not be allowed to connect to the server
-
-#### Docker
-
-MagicMirror² in server only mode can be deployed using [Docker](https://docker.com). After a successful [Docker installation](https://docs.docker.com/engine/installation/) you just need to execute the following command in the shell:
-
-```bash
-docker run  -d \
-			--publish 80:8080 \
-			--restart always \
-			--volume ~/magic_mirror/config:/opt/magic_mirror/config \
-			--volume ~/magic_mirror/modules:/opt/magic_mirror/modules \
-			--name magic_mirror \
-			bastilimbach/docker-magicmirror
-```
-
-| **Volumes** | **Description** |
-| --- | --- |
-| `/opt/magic_mirror/config` | Mount this volume to insert your own config into the docker container. |
-| `/opt/magic_mirror/modules` | Mount this volume to add your own custom modules into the docker container. |
-
-You may need to add your Docker Host IP to your `ipWhitelist` option. If you have some issues setting up this configuration, check [this forum post](https://forum.magicmirror.builders/topic/1326/ipwhitelist-howto).
-
-```javascript
-var config = {
-	ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1", "::ffff:172.17.0.1"]
-};
-```
-
-If you want to run the server on a raspberry pi, use the `raspberry` tag. (bastilimbach/docker-magicmirror:raspberry)
-
-#### Manual
-
-1. Download and install the latest Node.js version.
-2. Clone the repository and check out the master branch: `git clone https://github.com/MichMich/MagicMirror`
-3. Enter the repository: `cd ~/MagicMirror`
-4. Install and run the app: `npm install && node serveronly`
-
-### Raspberry Configuration & Auto Start.
-
-The following wiki links are helpful in the configuration of your MagicMirror² operating system:
-- [Configuring the Raspberry Pi](https://github.com/MichMich/MagicMirror/wiki/Configuring-the-Raspberry-Pi)
-- [Auto Starting MagicMirror](https://github.com/MichMich/MagicMirror/wiki/Auto-Starting-MagicMirror)
-
-### Updating your MagicMirror²
-
-If you want to update your MagicMirror² to the latest version, use your terminal to go to your Magic Mirror folder and type the following command:
-
-```bash
-git pull && npm install
-```
-
-If you changed nothing more than the config or the modules, this should work without any problems.
-Type `git status` to see your changes, if there are any, you can reset them with `git reset --hard`. After that, git pull should be possible.
-
-## Configuration
-
-1. Duplicate `config/config.js.sample` to `config/config.js`. **Note:** If you used the installer script. This step is already done for you.
-2. Modify your required settings.
-
-Note: You'll can check your configuration running the follow command:
-```bash
-npm run config:check
-```
-
-The following properties can be configured:
-
-| **Option** | **Description** |
-| --- | --- |
-| `port` | The port on which the MagicMirror² server will run on. The default value is `8080`. |
-| `address` | The ip address the accept connections. The  default open bind `localhost`.  Example config: `192.168.10.100`. |
-| `ipWhitelist` | The list of IPs from which you are allowed to access the MagicMirror². The default value is `["127.0.0.1", "::ffff:127.0.0.1", "::1"]`. It is possible to specify IPs with subnet masks (`["127.0.0.1", "127.0.0.1/24"]`) or define ip ranges (`["127.0.0.1", ["192.168.0.1", "192.168.0.100"]]`). Set `[]` to allow all IP addresses. For more information about how configure this directive see the [follow post ipWhitelist HowTo](https://forum.magicmirror.builders/topic/1326/ipwhitelist-howto) |
-| `zoom` | This allows to scale the mirror contents with a given zoom factor. The default value is `1.0`|
-| `language` | The language of the interface. (Note: Not all elements will be localized.) Possible values are `en`, `nl`, `ru`, `fr`, etc., but the default value is `en`. |
-| `timeFormat` | The form of time notation that will be used. Possible values are `12` or `24`. The default is `24`. |
-| `units` | The units that will be used in the default weather modules. Possible values are `metric` or `imperial`. The default is `metric`. |
-| `modules` | An array of active modules. **The array must contain objects. See the next table below for more information.** |
-| `electronOptions` | An optional array of Electron (browser) options. This allows configuration of e.g. the browser screen size and position (example: `electronOptions: { fullscreen: false, width: 800, height: 600 }`). Kiosk mode can be enabled by setting `kiosk = true`, `autoHideMenuBar = false` and `fullscreen = false`. More options can be found [here](https://github.com/electron/electron/blob/master/docs/api/browser-window.md). |
-| `customCss` | The path of the `custom.css` stylesheet. The default is `css/custom.css`. |
-
-Module configuration:
-
-| **Option** | **Description** |
-| --- | --- |
-| `module` | The name of the module. This can also contain the subfolder. Valid examples include `clock`, `default/calendar` and `custommodules/mymodule`. |
-| `position` | The location of the module in which the module will be loaded. Possible values are `top_ bar`, `top_left`, `top_center`, `top_right`, `upper_third`, `middle_center`, `lower_third`, `bottom_left`, `bottom_center`, `bottom_right`, `bottom_bar`, `fullscreen_above`, and `fullscreen_below`. This field is optional but most modules require this field to set. Check the documentation of the module for more information. Multiple modules with the same position will be ordered based on the order in the configuration file. |
-| `classes` | Additional classes which are passed to the module. The field is optional. |
-| `header` | To display a header text above the module, add the header property. This field is optional. |
-| `disabled` | Set disabled to `true` to skip creating the module. This field is optional. |
-| `config` | An object with the module configuration properties. Check the documentation of the module for more information. This field is optional, unless the module requires extra configuration. |
-
-## Modules
-
-The following modules are installed by default.
-
-- [**Clock**](modules/default/clock)
-- [**Calendar**](modules/default/calendar)
-- [**Current Weather**](modules/default/currentweather)
-- [**Weather Forecast**](modules/default/weatherforecast)
-- [**News Feed**](modules/default/newsfeed)
-- [**Compliments**](modules/default/compliments)
-- [**Hello World**](modules/default/helloworld)
-- [**Alert**](modules/default/alert)
-
-For more available modules, check out out the wiki page: [MagicMirror² Modules](https://github.com/MichMich/MagicMirror/wiki/MagicMirror²-Modules). If you want to build your own modules, check out the [MagicMirror² Module Development Documentation](modules) and don't forget to add it to the wiki and the [forum](https://forum.magicmirror.builders/category/7/showcase)!
-
-## Known issues
-
-- Electron seems to have some issues on certain Raspberry Pi 2's. See [#145](https://github.com/MichMich/MagicMirror/issues/145).
-- MagicMirror² (Electron) sometimes quits without an error after an extended period of use. See [#150](https://github.com/MichMich/MagicMirror/issues/150).
-
-## Community
-
-The community around the MagicMirror² is constantly growing. We even have a [forum](https://forum.magicmirror.builders) now where you can share your ideas, ask questions, help others and get inspired by other builders. We would love to see you there!
+- Website: [https://magicmirror.builders](https://magicmirror.builders)
+- Documentation: [https://docs.magicmirror.builders](https://docs.magicmirror.builders)
+- Forum: [https://forum.magicmirror.builders](https://forum.magicmirror.builders)
+- Discord: [https://discord.gg/J5BAtvx](https://discord.gg/J5BAtvx)
+- Blog: [https://michaelteeuw.nl/tagged/magicmirror](https://michaelteeuw.nl/tagged/magicmirror)
+- Donations: [https://magicmirror.builders/#donate](https://magicmirror.builders/#donate)
 
 ## Contributing Guidelines
 
-Contributions of all kinds are welcome, not only in the form of code but also with regards bug reports and documentation.
+Contributions of all kinds are welcome, not only in the form of code but also with regards bug reports and documentation. For the full contribution guidelines, check out: [https://docs.magicmirror.builders/getting-started/contributing.html](https://docs.magicmirror.builders/getting-started/contributing.html)
 
-Please keep the following in mind:
+## Enjoying MagicMirror? Consider a donation!
 
-- **Bug Reports**:  Make sure you're running the latest version. If the issue(s) still persist: please open a clearly documented issue with a clear title.
-- **Minor Bug Fixes**: Please send a pull request with a clear explanation of the issue or a link to the issue it solves.
-- **Major Bug Fixes**: please discuss your approach in an GitHub issue before you start to alter a big part of the code.
-- **New Features**: please please discuss in a GitHub issue before you start to alter a big part of the code. Without discussion upfront, the pull request will not be accepted / merged.
+MagicMirror² is opensource and free. That doesn't mean we don't need any money.
 
-Thanks for your help in making MagicMirror² better!
+Please consider a donation to help us cover the ongoing costs like webservers and email services.
+If we receive enough donations we might even be able to free up some working hours and spend some extra time improving the MagicMirror² core.
+
+To donate, please follow [this](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=G5D8E9MR5DTD2&source=url) link.
 
 <p align="center">
 <br>

clientonly/index.js

@@ -1,8 +1,6 @@
-/* jshint esversion: 6 */
-
 "use strict";
 
-// Use seperate scope to prevent global scope pollution
+// Use separate scope to prevent global scope pollution
 (function () {
 	var config = {};
 
@@ -19,7 +17,10 @@
 		// Prefer command line arguments over environment variables
 		["address", "port"].forEach((key) => {
 			config[key] = getCommandLineParameter(key, process.env[key.toUpperCase()]);
-		})
+		});
+
+		// determine if "--use-tls"-flag was provided
+		config["tls"] = process.argv.indexOf("--use-tls") > 0;
 	}
 
 	function getServerConfig(url) {
@@ -30,27 +31,27 @@
 			const request = lib.get(url, (response) => {
 				var configData = "";
 
-				// Gather incomming data
-				response.on("data", function(chunk) {
+				// Gather incoming data
+				response.on("data", function (chunk) {
 					configData += chunk;
 				});
 				// Resolve promise at the end of the HTTP/HTTPS stream
-				response.on("end", function() {
+				response.on("end", function () {
 					resolve(JSON.parse(configData));
 				});
 			});
 
-			request.on("error", function(error) {
+			request.on("error", function (error) {
 				reject(new Error(`Unable to read config from server (${url} (${error.message}`));
 			});
-		})
-	};
+		});
+	}
 
 	function fail(message, code = 1) {
 		if (message !== undefined && typeof message === "string") {
 			console.log(message);
 		} else {
-			console.log("Usage: 'node clientonly --address 192.168.1.10 --port 8080'");
+			console.log("Usage: 'node clientonly --address 192.168.1.10 --port 8080 [--use-tls]'");
 		}
 		process.exit(code);
 	}
@@ -58,17 +59,19 @@
 	getServerAddress();
 
 	(config.address && config.port) || fail();
+	var prefix = config.tls ? "https://" : "http://";
 
 	// Only start the client if a non-local server was provided
 	if (["localhost", "127.0.0.1", "::1", "::ffff:127.0.0.1", undefined].indexOf(config.address) === -1) {
-		getServerConfig(`http://${config.address}:${config.port}/config/`)
-			.then(function (config) {
+		getServerConfig(`${prefix}${config.address}:${config.port}/config/`)
+			.then(function (configReturn) {
 				// Pass along the server config via an environment variable
 				var env = Object.create(process.env);
 				var options = { env: env };
-				config.address = config.address;
-				config.port = config.port;
-				env.config = JSON.stringify(config);
+				configReturn.address = config.address;
+				configReturn.port = config.port;
+				configReturn.tls = config.tls;
+				env.config = JSON.stringify(configReturn);
 
 				// Spawn electron application
 				const electron = require("electron");
@@ -88,12 +91,11 @@
 					process.stdout.write(`Client: ${err}`);
 				});
 
-				child.on('close', (code) => {
-					if (code != 0) {
+				child.on("close", (code) => {
+					if (code !== 0) {
 						console.log(`There something wrong. The clientonly is not running code ${code}`);
 					}
 				});
-
 			})
 			.catch(function (reason) {
 				fail(`Unable to connect to server: (${reason})`);
@@ -101,4 +103,4 @@
 	} else {
 		fail();
 	}
-}());
+})();

config/config.js.sample

@@ -1,29 +1,41 @@
 /* Magic Mirror Config Sample
  *
- * By Michael Teeuw http://michaelteeuw.nl
+ * By Michael Teeuw https://michaelteeuw.nl
  * MIT Licensed.
  *
- * For more information how you can configurate this file
+ * For more information on how you can configure this file
  * See https://github.com/MichMich/MagicMirror#configuration
  *
  */
 
 var config = {
-	address: "localhost", // Address to listen on, can be:
-	                      // - "localhost", "127.0.0.1", "::1" to listen on loopback interface
-	                      // - another specific IPv4/6 to listen on a specific interface
-	                      // - "", "0.0.0.0", "::" to listen on any interface
-	                      // Default, when address config is left out, is "localhost"
+	address: "localhost", 	// Address to listen on, can be:
+							// - "localhost", "127.0.0.1", "::1" to listen on loopback interface
+							// - another specific IPv4/6 to listen on a specific interface
+							// - "0.0.0.0", "::" to listen on any interface
+							// Default, when address config is left out or empty, is "localhost"
 	port: 8080,
-	ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], // Set [] to allow all IP addresses
-	                                                       // or add a specific IPv4 of 192.168.1.5 :
-	                                                       // ["127.0.0.1", "::ffff:127.0.0.1", "::1", "::ffff:192.168.1.5"],
-	                                                       // or IPv4 range of 192.168.3.0 --> 192.168.3.15 use CIDR format :
-	                                                       // ["127.0.0.1", "::ffff:127.0.0.1", "::1", "::ffff:192.168.3.0/28"],
+	basePath: "/", 	// The URL path where MagicMirror is hosted. If you are using a Reverse proxy
+					// you must set the sub path here. basePath must end with a /
+	ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], 	// Set [] to allow all IP addresses
+															// or add a specific IPv4 of 192.168.1.5 :
+															// ["127.0.0.1", "::ffff:127.0.0.1", "::1", "::ffff:192.168.1.5"],
+															// or IPv4 range of 192.168.3.0 --> 192.168.3.15 use CIDR format :
+															// ["127.0.0.1", "::ffff:127.0.0.1", "::1", "::ffff:192.168.3.0/28"],
+
+	useHttps: false, 		// Support HTTPS or not, default "false" will use HTTP
+	httpsPrivateKey: "", 	// HTTPS private key path, only require when useHttps is true
+	httpsCertificate: "", 	// HTTPS Certificate path, only require when useHttps is true
 
 	language: "en",
+	logLevel: ["INFO", "LOG", "WARN", "ERROR"],
 	timeFormat: 24,
 	units: "metric",
+	// serverOnly:  true/false/"local" ,
+	// local for armv6l processors, default
+	//   starts serveronly and then starts chrome browser
+	// false, default for all NON-armv6l devices
+	// true, force serveronly mode, because you want to.. no UI on this device
 
 	modules: [
 		{
@@ -44,9 +56,8 @@ var config = {
 			config: {
 				calendars: [
 					{
-						symbol: "calendar-check-o ",
-						url: "webcal://www.calendarlabs.com/templates/ical/US-Holidays.ics"
-					}
+						symbol: "calendar-check",
+						url: "webcal://www.calendarlabs.com/ical-calendar/ics/76/US_Holidays.ics"					}
 				]
 			}
 		},
@@ -59,7 +70,7 @@ var config = {
 			position: "top_right",
 			config: {
 				location: "New York",
-				locationID: "",  //ID from http://www.openweathermap.org/help/city_list.txt
+				locationID: "", //ID from http://bulk.openweathermap.org/sample/city.list.json.gz; unzip the gz file and find your city
 				appid: "YOUR_OPENWEATHER_API_KEY"
 			}
 		},
@@ -69,7 +80,7 @@ var config = {
 			header: "Weather Forecast",
 			config: {
 				location: "New York",
-				locationID: "5128581",  //ID from http://www.openweathermap.org/help/city_list.txt
+				locationID: "5128581", //ID from http://bulk.openweathermap.org/sample/city.list.json.gz; unzip the gz file and find your city
 				appid: "YOUR_OPENWEATHER_API_KEY"
 			}
 		},
@@ -80,15 +91,16 @@ var config = {
 				feeds: [
 					{
 						title: "New York Times",
-						url: "http://www.nytimes.com/services/xml/rss/nyt/HomePage.xml"
+						url: "https://rss.nytimes.com/services/xml/rss/nyt/HomePage.xml"
 					}
 				],
 				showSourceTitle: true,
-				showPublishDate: true
+				showPublishDate: true,
+				broadcastNewsFeeds: true,
+				broadcastNewsUpdates: true
 			}
 		},
 	]
-
 };
 
 /*************** DO NOT EDIT THE LINE BELOW ***************/

css/custom.css

@@ -1,14 +0,0 @@
-/*****************************************************
- * Magic Mirror                                      *
- * Custom CSS                                        *
- *                                                   *
- * By Michael Teeuw http://michaelteeuw.nl           *
- * MIT Licensed.                                     *
- *                                                   *
- * Add any custom CSS below.                         *
- * Changes to this files will be ignored by GIT. *
- *****************************************************/
-
- body {
- 	
- }

css/main.css

@@ -128,6 +128,10 @@ sup {
   text-overflow: ellipsis;
 }
 
+.pre-line {
+  white-space: pre-line;
+}
+
 /**
  * Region Definitions.
  */
@@ -173,10 +177,6 @@ sup {
 .region.top.center,
 .region.bottom.center {
   left: 50%;
-  -moz-transform: translateX(-50%);
-  -o-transform: translateX(-50%);
-  -webkit-transform: translateX(-50%);
-  -ms-transform: translateX(-50%);
   transform: translateX(-50%);
 }
 
@@ -209,10 +209,6 @@ sup {
 .region.middle.center {
   width: 100%;
   text-align: center;
-  -moz-transform: translateY(-50%);
-  -o-transform: translateY(-50%);
-  -webkit-transform: translateY(-50%);
-  -ms-transform: translateY(-50%);
   transform: translateY(-50%);
 }
 

dangerfile.js

@@ -0,0 +1,17 @@
+import { danger, fail, warn } from "danger";
+
+// Check if the CHANGELOG.md file has been edited
+// Fail the build and post a comment reminding submitters to do so if it wasn't changed
+if (!danger.git.modified_files.includes("CHANGELOG.md")) {
+	warn("Please include an updated `CHANGELOG.md` file.<br>This way we can keep track of all the contributions.");
+}
+
+// Check if the PR request is send to the master branch.
+// This should only be done by MichMich.
+if (danger.github.pr.base.ref === "master" && danger.github.pr.user.login !== "MichMich") {
+	// Check if the PR body or title includes the text: #accepted.
+	// If not, the PR will fail.
+	if ((danger.github.pr.body + danger.github.pr.title).includes("#accepted")) {
+		fail("Please send all your pull requests to the `develop` branch.<br>Pull requests on the `master` branch will not be accepted.");
+	}
+}

fonts/package-lock.json

@@ -4,9 +4,9 @@
   "lockfileVersion": 1,
   "dependencies": {
     "roboto-fontface": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/roboto-fontface/-/roboto-fontface-0.8.0.tgz",
-      "integrity": "sha512-ZYzRkETgBrdEGzL5JSKimvjI2CX7ioyZCkX2BpcfyjqI+079W0wHAyj5W4rIZMcDSOHgLZtgz1IdDi/vU77KEQ=="
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/roboto-fontface/-/roboto-fontface-0.10.0.tgz",
+      "integrity": "sha512-OlwfYEgA2RdboZohpldlvJ1xngOins5d7ejqnIBWr9KaMxsnBqotpptRXTyfNRLnFpqzX6sTDt+X+a+6udnU8g=="
     }
   }
 }

fonts/package.json

@@ -1,15 +1,15 @@
 {
-  "name": "magicmirror-fonts",
-  "description": "Package for fonts use by MagicMirror Core.",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/MichMich/MagicMirror.git"
-  },
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/MichMich/MagicMirror/issues"
-  },
-  "dependencies": {
-    "roboto-fontface": "^0.8.0"
-  }
+	"name": "magicmirror-fonts",
+	"description": "Package for fonts use by MagicMirror Core.",
+	"repository": {
+		"type": "git",
+		"url": "git+https://github.com/MichMich/MagicMirror.git"
+	},
+	"license": "MIT",
+	"bugs": {
+		"url": "https://github.com/MichMich/MagicMirror/issues"
+	},
+	"dependencies": {
+		"roboto-fontface": "^0.10.0"
+	}
 }

fonts/roboto.css

@@ -2,94 +2,57 @@
   font-family: Roboto;
   font-style: normal;
   font-weight: 100;
-  src:
-    local("Roboto Thin"),
-    local("Roboto-Thin"),
-    url("node_modules/roboto-fontface/fonts/roboto/Roboto-Thin.woff2") format("woff2"),
-    url("node_modules/roboto-fontface/fonts/roboto/Roboto-Thin.woff") format("woff"),
-    url("node_modules/roboto-fontface/fonts/roboto/Roboto-Thin.ttf") format("truetype");
+  src: local("Roboto Thin"), local("Roboto-Thin"), url("node_modules/roboto-fontface/fonts/roboto/Roboto-Thin.woff2") format("woff2"), url("node_modules/roboto-fontface/fonts/roboto/Roboto-Thin.woff") format("woff");
 }
 
 @font-face {
   font-family: "Roboto Condensed";
   font-style: normal;
   font-weight: 300;
-  src:
-    local("Roboto Condensed Light"),
-    local("RobotoCondensed-Light"),
-    url("node_modules/roboto-fontface/fonts/roboto-condensed/Roboto-Condensed-Light.woff2") format("woff2"),
-    url("node_modules/roboto-fontface/fonts/roboto-condensed/Roboto-Condensed-Light.woff") format("woff"),
-    url("node_modules/roboto-fontface/fonts/roboto-condensed/Roboto-Condensed-Light.ttf") format("truetype");
+  src: local("Roboto Condensed Light"), local("RobotoCondensed-Light"), url("node_modules/roboto-fontface/fonts/roboto-condensed/Roboto-Condensed-Light.woff2") format("woff2"),
+    url("node_modules/roboto-fontface/fonts/roboto-condensed/Roboto-Condensed-Light.woff") format("woff");
 }
 
 @font-face {
   font-family: "Roboto Condensed";
   font-style: normal;
   font-weight: 400;
-  src:
-    local("Roboto Condensed"),
-    local("RobotoCondensed-Regular"),
-    url("node_modules/roboto-fontface/fonts/roboto-condensed/Roboto-Condensed-Regular.woff2") format("woff2"),
-    url("node_modules/roboto-fontface/fonts/roboto-condensed/Roboto-Condensed-Regular.woff") format("woff"),
-    url("node_modules/roboto-fontface/fonts/roboto-condensed/Roboto-Condensed-Regular.ttf") format("truetype");
+  src: local("Roboto Condensed"), local("RobotoCondensed-Regular"), url("node_modules/roboto-fontface/fonts/roboto-condensed/Roboto-Condensed-Regular.woff2") format("woff2"),
+    url("node_modules/roboto-fontface/fonts/roboto-condensed/Roboto-Condensed-Regular.woff") format("woff");
 }
 
 @font-face {
   font-family: "Roboto Condensed";
   font-style: normal;
   font-weight: 700;
-  src:
-    local("Roboto Condensed Bold"),
-    local("RobotoCondensed-Bold"),
-    url("node_modules/roboto-fontface/fonts/roboto-condensed/Roboto-Condensed-Bold.woff2") format("woff2"),
-    url("node_modules/roboto-fontface/fonts/roboto-condensed/Roboto-Condensed-Bold.woff") format("woff"),
-    url("node_modules/roboto-fontface/fonts/roboto-condensed/Roboto-Condensed-Bold.ttf") format("truetype");
+  src: local("Roboto Condensed Bold"), local("RobotoCondensed-Bold"), url("node_modules/roboto-fontface/fonts/roboto-condensed/Roboto-Condensed-Bold.woff2") format("woff2"),
+    url("node_modules/roboto-fontface/fonts/roboto-condensed/Roboto-Condensed-Bold.woff") format("woff");
 }
 
 @font-face {
   font-family: Roboto;
   font-style: normal;
   font-weight: 400;
-  src:
-    local("Roboto"),
-    local("Roboto-Regular"),
-    url("node_modules/roboto-fontface/fonts/roboto/Roboto-Regular.woff2") format("woff2"),
-    url("node_modules/roboto-fontface/fonts/roboto/Roboto-Regular.woff") format("woff"),
-    url("node_modules/roboto-fontface/fonts/roboto/Roboto-Regular.ttf") format("truetype");
+  src: local("Roboto"), local("Roboto-Regular"), url("node_modules/roboto-fontface/fonts/roboto/Roboto-Regular.woff2") format("woff2"), url("node_modules/roboto-fontface/fonts/roboto/Roboto-Regular.woff") format("woff");
 }
 
 @font-face {
   font-family: Roboto;
   font-style: normal;
   font-weight: 500;
-  src:
-    local("Roboto Medium"),
-    local("Roboto-Medium"),
-    url("node_modules/roboto-fontface/fonts/roboto/Roboto-Medium.woff2") format("woff2"),
-    url("node_modules/roboto-fontface/fonts/roboto/Roboto-Medium.woff") format("woff"),
-    url("node_modules/roboto-fontface/fonts/roboto/Roboto-Medium.ttf") format("truetype");
+  src: local("Roboto Medium"), local("Roboto-Medium"), url("node_modules/roboto-fontface/fonts/roboto/Roboto-Medium.woff2") format("woff2"), url("node_modules/roboto-fontface/fonts/roboto/Roboto-Medium.woff") format("woff");
 }
 
 @font-face {
   font-family: Roboto;
   font-style: normal;
   font-weight: 700;
-  src:
-    local("Roboto Bold"),
-    local("Roboto-Bold"),
-    url("node_modules/roboto-fontface/fonts/roboto/Roboto-Bold.woff2") format("woff2"),
-    url("node_modules/roboto-fontface/fonts/roboto/Roboto-Bold.woff") format("woff"),
-    url("node_modules/roboto-fontface/fonts/roboto/Roboto-Bold.ttf") format("truetype");
+  src: local("Roboto Bold"), local("Roboto-Bold"), url("node_modules/roboto-fontface/fonts/roboto/Roboto-Bold.woff2") format("woff2"), url("node_modules/roboto-fontface/fonts/roboto/Roboto-Bold.woff") format("woff");
 }
 
 @font-face {
   font-family: Roboto;
   font-style: normal;
   font-weight: 300;
-  src:
-    local("Roboto Light"),
-    local("Roboto-Light"),
-    url("node_modules/roboto-fontface/fonts/roboto/Roboto-Light.woff2") format("woff2"),
-    url("node_modules/roboto-fontface/fonts/roboto/Roboto-Light.woff") format("woff"),
-    url("node_modules/roboto-fontface/fonts/roboto/Roboto-Light.ttf") format("truetype");
+  src: local("Roboto Light"), local("Roboto-Light"), url("node_modules/roboto-fontface/fonts/roboto/Roboto-Light.woff2") format("woff2"), url("node_modules/roboto-fontface/fonts/roboto/Roboto-Light.woff") format("woff");
 }

index.html

@@ -37,7 +37,7 @@
 		<div class="region bottom right"><div class="container"></div></div>
 	</div>
 	<div class="region fullscreen above"><div class="container"></div></div>
-	<script type="text/javascript" src="/socket.io/socket.io.js"></script>
+	<script type="text/javascript" src="socket.io/socket.io.js"></script>
 	<script type="text/javascript" src="vendor/node_modules/nunjucks/browser/nunjucks.min.js"></script>
 	<script type="text/javascript" src="js/defaults.js"></script>
 	<script type="text/javascript" src="#CONFIG_FILE#"></script>

installers/mm.sh

@@ -1,2 +1,3 @@
+# This file is still here to keep PM2 working on older installations.
 cd ~/MagicMirror
 DISPLAY=:0 npm start

installers/pm2_MagicMirror.json

@@ -1,7 +0,0 @@
-{
-  "apps" : [{
-    "name"        : "MagicMirror",
-    "script"      : "/home/pi/MagicMirror/installers/mm.sh",
-    "watch"       : ["/home/pi/MagicMirror/config/config.js"]
-  }]
-}

installers/postinstall/postinstall.sh

@@ -1,2 +0,0 @@
-echo "\033[32mMagicMirror installation successful!"
-exit 0

installers/raspberry.sh

@@ -1,163 +0,0 @@
-#!/usr/bin/env bash
-
-# This is an installer script for MagicMirror2. It works well enough
-# that it can detect if you have Node installed, run a binary script
-# and then download and run MagicMirror2.
-
-echo -e "\e[0m"
-echo '$$\      $$\                     $$\           $$\      $$\ $$\                                          $$$$$$\'
-echo '$$$\    $$$ |                    \__|          $$$\    $$$ |\__|                                        $$  __$$\'
-echo '$$$$\  $$$$ | $$$$$$\   $$$$$$\  $$\  $$$$$$$\ $$$$\  $$$$ |$$\  $$$$$$\   $$$$$$\   $$$$$$\   $$$$$$\  \__/  $$ |'
-echo '$$\$$\$$ $$ | \____$$\ $$  __$$\ $$ |$$  _____|$$\$$\$$ $$ |$$ |$$  __$$\ $$  __$$\ $$  __$$\ $$  __$$\  $$$$$$  |'
-echo '$$ \$$$  $$ | $$$$$$$ |$$ /  $$ |$$ |$$ /      $$ \$$$  $$ |$$ |$$ |  \__|$$ |  \__|$$ /  $$ |$$ |  \__|$$  ____/'
-echo '$$ |\$  /$$ |$$  __$$ |$$ |  $$ |$$ |$$ |      $$ |\$  /$$ |$$ |$$ |      $$ |      $$ |  $$ |$$ |      $$ |'
-echo '$$ | \_/ $$ |\$$$$$$$ |\$$$$$$$ |$$ |\$$$$$$$\ $$ | \_/ $$ |$$ |$$ |      $$ |      \$$$$$$  |$$ |      $$$$$$$$\'
-echo '\__|     \__| \_______| \____$$ |\__| \_______|\__|     \__|\__|\__|      \__|       \______/ \__|      \________|'
-echo '                       $$\   $$ |'
-echo '                       \$$$$$$  |'
-echo '                        \______/'
-echo -e "\e[0m"
-
-# Define the tested version of Node.js.
-NODE_TESTED="v5.1.0"
-
-# Determine which Pi is running.
-ARM=$(uname -m) 
-
-# Check the Raspberry Pi version.
-if [ "$ARM" != "armv7l" ]; then
-	echo -e "\e[91mSorry, your Raspberry Pi is not supported."
-	echo -e "\e[91mPlease run MagicMirror on a Raspberry Pi 2 or 3."
-	echo -e "\e[91mIf this is a Pi Zero, you are in the same boat as the original Raspberry Pi. You must run in server only mode."
-	exit;
-fi
-
-# Define helper methods.
-function version_gt() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" != "$1"; }
-function command_exists () { type "$1" &> /dev/null ;}
-
-# Update before first apt-get
-echo -e "\e[96mUpdating packages ...\e[90m"
-sudo apt-get update || echo -e "\e[91mUpdate failed, carrying on installation ...\e[90m"
-
-# Installing helper tools
-echo -e "\e[96mInstalling helper tools ...\e[90m"
-sudo apt-get install curl wget git build-essential unzip || exit
-
-# Check if we need to install or upgrade Node.js.
-echo -e "\e[96mCheck current Node installation ...\e[0m"
-NODE_INSTALL=false
-if command_exists node; then
-	echo -e "\e[0mNode currently installed. Checking version number.";
-	NODE_CURRENT=$(node -v)
-	echo -e "\e[0mMinimum Node version: \e[1m$NODE_TESTED\e[0m"
-	echo -e "\e[0mInstalled Node version: \e[1m$NODE_CURRENT\e[0m"
-	if version_gt $NODE_TESTED $NODE_CURRENT; then
-		echo -e "\e[96mNode should be upgraded.\e[0m"
-		NODE_INSTALL=true
-
-		# Check if a node process is currenlty running.
-		# If so abort installation.
-		if pgrep "node" > /dev/null; then
-			echo -e "\e[91mA Node process is currently running. Can't upgrade."
-			echo "Please quit all Node processes and restart the installer."
-			exit;
-		fi
-
-	else
-		echo -e "\e[92mNo Node.js upgrade necessary.\e[0m"
-	fi
-
-else
-	echo -e "\e[93mNode.js is not installed.\e[0m";
-	NODE_INSTALL=true
-fi
-
-# Install or upgrade node if necessary.
-if $NODE_INSTALL; then
-	
-	echo -e "\e[96mInstalling Node.js ...\e[90m"
-
-	# Fetch the latest version of Node.js from the selected branch
-	# The NODE_STABLE_BRANCH variable will need to be manually adjusted when a new branch is released. (e.g. 7.x)
-	# Only tested (stable) versions are recommended as newer versions could break MagicMirror.
-	
-	NODE_STABLE_BRANCH="6.x"
-	curl -sL https://deb.nodesource.com/setup_$NODE_STABLE_BRANCH | sudo -E bash -
-	sudo apt-get install -y nodejs
-	echo -e "\e[92mNode.js installation Done!\e[0m"
-fi
-
-# Install MagicMirror
-cd ~
-if [ -d "$HOME/MagicMirror" ] ; then
-	echo -e "\e[93mIt seems like MagicMirror is already installed."
-	echo -e "To prevent overwriting, the installer will be aborted."
-	echo -e "Please rename the \e[1m~/MagicMirror\e[0m\e[93m folder and try again.\e[0m"
-	echo ""
-	echo -e "If you want to upgrade your installation run \e[1m\e[97mgit pull\e[0m from the ~/MagicMirror directory."
-	echo ""
-	exit;
-fi
-
-echo -e "\e[96mCloning MagicMirror ...\e[90m"
-if git clone https://github.com/MichMich/MagicMirror.git; then 
-	echo -e "\e[92mCloning MagicMirror Done!\e[0m"
-else
-	echo -e "\e[91mUnable to clone MagicMirror."
-	exit;
-fi
-
-cd ~/MagicMirror  || exit
-echo -e "\e[96mInstalling dependencies ...\e[90m"
-if npm install; then 
-	echo -e "\e[92mDependencies installation Done!\e[0m"
-else
-	echo -e "\e[91mUnable to install dependencies!"
-	exit;
-fi
-
-# Use sample config for start MagicMirror
-cp config/config.js.sample config/config.js
-
-# Check if plymouth is installed (default with PIXEL desktop environment), then install custom splashscreen.
-echo -e "\e[96mCheck plymouth installation ...\e[0m"
-if command_exists plymouth; then
-	THEME_DIR="/usr/share/plymouth/themes"
-	echo -e "\e[90mSplashscreen: Checking themes directory.\e[0m"
-	if [ -d $THEME_DIR ]; then
-		echo -e "\e[90mSplashscreen: Create theme directory if not exists.\e[0m"
-		if [ ! -d $THEME_DIR/MagicMirror ]; then
-			sudo mkdir $THEME_DIR/MagicMirror
-		fi
-
-		if sudo cp ~/MagicMirror/splashscreen/splash.png $THEME_DIR/MagicMirror/splash.png && sudo cp ~/MagicMirror/splashscreen/MagicMirror.plymouth $THEME_DIR/MagicMirror/MagicMirror.plymouth && sudo cp ~/MagicMirror/splashscreen/MagicMirror.script $THEME_DIR/MagicMirror/MagicMirror.script; then
-			echo -e "\e[90mSplashscreen: Theme copied successfully.\e[0m"
-			if sudo plymouth-set-default-theme -R MagicMirror; then
-				echo -e "\e[92mSplashscreen: Changed theme to MagicMirror successfully.\e[0m"
-			else
-				echo -e "\e[91mSplashscreen: Couldn't change theme to MagicMirror!\e[0m"
-			fi
-		else
-			echo -e "\e[91mSplashscreen: Copying theme failed!\e[0m"
-		fi
-	else
-		echo -e "\e[91mSplashscreen: Themes folder doesn't exist!\e[0m"
-	fi
-else
-	echo -e "\e[93mplymouth is not installed.\e[0m";
-fi
-
-# Use pm2 control like a service MagicMirror
-read -p "Do you want use pm2 for auto starting of your MagicMirror (y/n)?" choice
-if [[ $choice =~ ^[Yy]$ ]]; then
-    sudo npm install -g pm2
-    sudo su -c "env PATH=$PATH:/usr/bin pm2 startup linux -u pi --hp /home/pi"
-    pm2 start ~/MagicMirror/installers/pm2_MagicMirror.json
-    pm2 save
-fi
-
-echo " "
-echo -e "\e[92mWe're ready! Run \e[1m\e[97mDISPLAY=:0 npm start\e[0m\e[92m from the ~/MagicMirror directory to start your MagicMirror.\e[0m"
-echo " "
-echo " "

js/app.js

@@ -1,19 +1,22 @@
 /* Magic Mirror
  * The Core App (Server)
  *
- * By Michael Teeuw http://michaelteeuw.nl
+ * By Michael Teeuw https://michaelteeuw.nl
  * MIT Licensed.
  */
-
 var fs = require("fs");
+var path = require("path");
+var Log = require(__dirname + "/logger.js");
 var Server = require(__dirname + "/server.js");
 var Utils = require(__dirname + "/utils.js");
 var defaultModules = require(__dirname + "/../modules/default/defaultmodules.js");
-var path = require("path");
+
+// Alias modules mentioned in package.js under _moduleAliases.
+require("module-alias/register");
 
 // Get version number.
 global.version = JSON.parse(fs.readFileSync("package.json", "utf8")).version;
-console.log("Starting MagicMirror: v" + global.version);
+Log.log("Starting MagicMirror: v" + global.version);
 
 // global absolute root path
 global.root_path = path.resolve(__dirname + "/../");
@@ -31,15 +34,15 @@ if (process.env.MM_PORT) {
 // The next part is here to prevent a major exception when there
 // is no internet connection. This could probable be solved better.
 process.on("uncaughtException", function (err) {
-	console.log("Whoops! There was an uncaught exception...");
-	console.error(err);
-	console.log("MagicMirror will not quit, but it might be a good idea to check why this happened. Maybe no internet connection?");
-	console.log("If you think this really is an issue, please open an issue on GitHub: https://github.com/MichMich/MagicMirror/issues");
+	Log.error("Whoops! There was an uncaught exception...");
+	Log.error(err);
+	Log.error("MagicMirror will not quit, but it might be a good idea to check why this happened. Maybe no internet connection?");
+	Log.error("If you think this really is an issue, please open an issue on GitHub: https://github.com/MichMich/MagicMirror/issues");
 });
 
 /* App - The core app.
  */
-var App = function() {
+var App = function () {
 	var nodeHelpers = [];
 
 	/* loadConfig(callback)
@@ -48,16 +51,15 @@ var App = function() {
 	 *
 	 * argument callback function - The callback function.
 	 */
-
-	var loadConfig = function(callback) {
-		console.log("Loading config ...");
+	var loadConfig = function (callback) {
+		Log.log("Loading config ...");
 		var defaults = require(__dirname + "/defaults.js");
 
 		// For this check proposed to TestSuite
 		// https://forum.magicmirror.builders/topic/1456/test-suite-for-magicmirror/8
 		var configFilename = path.resolve(global.root_path + "/config/config.js");
-		if (typeof(global.configuration_file) !== "undefined") {
-		    configFilename = path.resolve(global.configuration_file);
+		if (typeof global.configuration_file !== "undefined") {
+			configFilename = path.resolve(global.configuration_file);
 		}
 
 		try {
@@ -67,50 +69,45 @@ var App = function() {
 			var config = Object.assign(defaults, c);
 			callback(config);
 		} catch (e) {
-			if (e.code == "ENOENT") {
-				console.error(Utils.colors.error("WARNING! Could not find config file. Please create one. Starting with default configuration."));
+			if (e.code === "ENOENT") {
+				Log.error(Utils.colors.error("WARNING! Could not find config file. Please create one. Starting with default configuration."));
 			} else if (e instanceof ReferenceError || e instanceof SyntaxError) {
-				console.error(Utils.colors.error("WARNING! Could not validate config file. Please correct syntax errors. Starting with default configuration."));
+				Log.error(Utils.colors.error("WARNING! Could not validate config file. Starting with default configuration. Please correct syntax errors at or above this line: " + e.stack));
 			} else {
-				console.error(Utils.colors.error("WARNING! Could not load config file. Starting with default configuration. Error found: " + e));
+				Log.error(Utils.colors.error("WARNING! Could not load config file. Starting with default configuration. Error found: " + e));
 			}
 			callback(defaults);
 		}
 	};
 
-	var checkDeprecatedOptions = function(userConfig) {
+	var checkDeprecatedOptions = function (userConfig) {
 		var deprecated = require(global.root_path + "/js/deprecated.js");
 		var deprecatedOptions = deprecated.configs;
 
 		var usedDeprecated = [];
 
-		deprecatedOptions.forEach(function(option) {
+		deprecatedOptions.forEach(function (option) {
 			if (userConfig.hasOwnProperty(option)) {
 				usedDeprecated.push(option);
 			}
 		});
 		if (usedDeprecated.length > 0) {
-			console.warn(Utils.colors.warn(
-				"WARNING! Your config is using deprecated options: " +
-				usedDeprecated.join(", ") +
-				". Check README and CHANGELOG for more up-to-date ways of getting the same functionality.")
-			);
+			Log.warn(Utils.colors.warn("WARNING! Your config is using deprecated options: " + usedDeprecated.join(", ") + ". Check README and CHANGELOG for more up-to-date ways of getting the same functionality."));
 		}
-	}
+	};
 
 	/* loadModule(module)
 	 * Loads a specific module.
 	 *
 	 * argument module string - The name of the module (including subpath).
 	 */
-	var loadModule = function(module, callback) {
-
+	var loadModule = function (module, callback) {
 		var elements = module.split("/");
 		var moduleName = elements[elements.length - 1];
-		var moduleFolder =  __dirname + "/../modules/" + module;
+		var moduleFolder = __dirname + "/../modules/" + module;
 
 		if (defaultModules.indexOf(moduleName) !== -1) {
-			moduleFolder =  __dirname + "/../modules/default/" + module;
+			moduleFolder = __dirname + "/../modules/default/" + module;
 		}
 
 		var helperPath = moduleFolder + "/node_helper.js";
@@ -120,7 +117,7 @@ var App = function() {
 			fs.accessSync(helperPath, fs.R_OK);
 		} catch (e) {
 			loadModule = false;
-			console.log("No helper found for module: " + moduleName + ".");
+			Log.log("No helper found for module: " + moduleName + ".");
 		}
 
 		if (loadModule) {
@@ -128,11 +125,11 @@ var App = function() {
 			var m = new Module();
 
 			if (m.requiresVersion) {
-				console.log("Check MagicMirror version for node helper '" + moduleName + "' - Minimum version:  " + m.requiresVersion + " - Current version: " + global.version);
+				Log.log("Check MagicMirror version for node helper '" + moduleName + "' - Minimum version:  " + m.requiresVersion + " - Current version: " + global.version);
 				if (cmpVersions(global.version, m.requiresVersion) >= 0) {
-					console.log("Version is ok!");
+					Log.log("Version is ok!");
 				} else {
-					console.log("Version is incorrect. Skip module: '" + moduleName + "'");
+					Log.log("Version is incorrect. Skip module: '" + moduleName + "'");
 					return;
 				}
 			}
@@ -152,19 +149,19 @@ var App = function() {
 	 *
 	 * argument module string - The name of the module (including subpath).
 	 */
-	var loadModules = function(modules, callback) {
-		console.log("Loading module helpers ...");
+	var loadModules = function (modules, callback) {
+		Log.log("Loading module helpers ...");
 
-		var loadNextModule = function() {
+		var loadNextModule = function () {
 			if (modules.length > 0) {
 				var nextModule = modules[0];
-				loadModule(nextModule, function() {
+				loadModule(nextModule, function () {
 					modules = modules.slice(1);
 					loadNextModule();
 				});
 			} else {
 				// All modules are loaded
-				console.log("All module helpers loaded.");
+				Log.log("All module helpers loaded.");
 				callback();
 			}
 		};
@@ -173,7 +170,7 @@ var App = function() {
 	};
 
 	/* cmpVersions(a,b)
-	 * Compare two symantic version numbers and return the difference.
+	 * Compare two semantic version numbers and return the difference.
 	 *
 	 * argument a string - Version number a.
 	 * argument a string - Version number b.
@@ -197,13 +194,12 @@ var App = function() {
 	/* start(callback)
 	 * This methods starts the core app.
 	 * It loads the config, then it loads all modules.
-	 * When it"s done it executs the callback with the config as argument.
+	 * When it's done it executes the callback with the config as argument.
 	 *
 	 * argument callback function - The callback function.
 	 */
-	this.start = function(callback) {
-
-		loadConfig(function(c) {
+	this.start = function (callback) {
+		loadConfig(function (c) {
 			config = c;
 
 			var modules = [];
@@ -215,9 +211,9 @@ var App = function() {
 				}
 			}
 
-			loadModules(modules, function() {
-				var server = new Server(config, function(app, io) {
-					console.log("Server started ...");
+			loadModules(modules, function () {
+				var server = new Server(config, function (app, io) {
+					Log.log("Server started ...");
 
 					for (var h in nodeHelpers) {
 						var nodeHelper = nodeHelpers[h];
@@ -226,12 +222,11 @@ var App = function() {
 						nodeHelper.start();
 					}
 
-					console.log("Sockets connected & modules started ...");
+					Log.log("Sockets connected & modules started ...");
 
 					if (typeof callback === "function") {
 						callback(config);
 					}
-
 				});
 			});
 		});
@@ -242,7 +237,7 @@ var App = function() {
 	 * This calls each node_helper's STOP() function, if it exists.
 	 * Added to fix #1056
 	 */
-	this.stop = function() {
+	this.stop = function () {
 		for (var h in nodeHelpers) {
 			var nodeHelper = nodeHelpers[h];
 			if (typeof nodeHelper.stop === "function") {
@@ -258,8 +253,21 @@ var App = function() {
 	 * this.stop() is called by app.on("before-quit"... in `electron.js`
 	 */
 	process.on("SIGINT", () => {
-		console.log("[SIGINT] Received. Shutting down server...");
-		setTimeout(() => { process.exit(0); }, 3000);  // Force quit after 3 seconds
+		Log.log("[SIGINT] Received. Shutting down server...");
+		setTimeout(() => {
+			process.exit(0);
+		}, 3000); // Force quit after 3 seconds
+		this.stop();
+		process.exit(0);
+	});
+
+	/* We also need to listen to SIGTERM signals so we stop everything when we are asked to stop by the OS.
+	 */
+	process.on("SIGTERM", () => {
+		Log.log("[SIGTERM] Received. Shutting down server...");
+		setTimeout(() => {
+			process.exit(0);
+		}, 3000); // Force quit after 3 seconds
 		this.stop();
 		process.exit(0);
 	});

js/check_config.js

@@ -0,0 +1,71 @@
+/* Magic Mirror
+ *
+ * Check the configuration file for errors
+ *
+ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com
+ * MIT Licensed.
+ */
+const Linter = require("eslint").Linter;
+const linter = new Linter();
+
+const path = require("path");
+const fs = require("fs");
+
+const rootPath = path.resolve(__dirname + "/../");
+const config = require(rootPath + "/.eslintrc.json");
+const Log = require(rootPath + "/js/logger.js");
+const Utils = require(rootPath + "/js/utils.js");
+
+/* getConfigFile()
+ * Return string with path of configuration file
+ * Check if set by environment variable MM_CONFIG_FILE
+ */
+function getConfigFile() {
+	// FIXME: This function should be in core. Do you want refactor me ;) ?, be good!
+	let configFileName = path.resolve(rootPath + "/config/config.js");
+	if (process.env.MM_CONFIG_FILE) {
+		configFileName = path.resolve(process.env.MM_CONFIG_FILE);
+	}
+	return configFileName;
+}
+
+function checkConfigFile() {
+	const configFileName = getConfigFile();
+
+	// Check if file is present
+	if (fs.existsSync(configFileName) === false) {
+		Log.error(Utils.colors.error("File not found: "), configFileName);
+		throw new Error("No config file present!");
+	}
+
+	// check permission
+	try {
+		fs.accessSync(configFileName, fs.F_OK);
+	} catch (e) {
+		Log.log(Utils.colors.error(e));
+		throw new Error("No permission to access config file!");
+	}
+
+	// Validate syntax of the configuration file.
+	Log.info(Utils.colors.info("Checking file... "), configFileName);
+
+	// I'm not sure if all ever is utf-8
+	fs.readFile(configFileName, "utf-8", function (err, data) {
+		if (err) {
+			throw err;
+		}
+		const messages = linter.verify(data, config);
+		if (messages.length === 0) {
+			Log.log("Your configuration file doesn't contain syntax errors :)");
+			return true;
+		} else {
+			// In case the there errors show messages and return
+			messages.forEach((error) => {
+				Log.log("Line", error.line, "col", error.column, error.message);
+			});
+			throw new Error("Wrong syntax in config file!");
+		}
+	});
+}
+
+checkConfigFile();

js/class.js

@@ -1,15 +1,22 @@
+/* global Class, xyz */
+
 /* Simple JavaScript Inheritance
- * By John Resig http://ejohn.org/
+ * By John Resig https://johnresig.com/
+ *
+ * Inspired by base2 and Prototype
+ *
  * MIT Licensed.
  */
-
-// Inspired by base2 and Prototype
 (function () {
 	var initializing = false;
-	var fnTest = /xyz/.test(function () { xyz; }) ? /\b_super\b/ : /.*/;
+	var fnTest = /xyz/.test(function () {
+		xyz;
+	})
+		? /\b_super\b/
+		: /.*/;
 
 	// The base Class implementation (does nothing)
-	this.Class = function () { };
+	this.Class = function () {};
 
 	// Create a new Class that inherits from this class
 	Class.extend = function (prop) {
@@ -21,32 +28,33 @@
 		var prototype = new this();
 		initializing = false;
 
-		// Make a copy of all prototype properies, to prevent reference issues.
-		for (var name in prototype) {
-			prototype[name] = cloneObject(prototype[name]);
+		// Make a copy of all prototype properties, to prevent reference issues.
+		for (var p in prototype) {
+			prototype[p] = cloneObject(prototype[p]);
 		}
 
 		// Copy the properties over onto the new prototype
 		for (var name in prop) {
 			// Check if we're overwriting an existing function
-			prototype[name] = typeof prop[name] == "function" &&
-				typeof _super[name] == "function" && fnTest.test(prop[name]) ? (function (name, fn) {
-					return function () {
-						var tmp = this._super;
+			prototype[name] =
+				typeof prop[name] === "function" && typeof _super[name] === "function" && fnTest.test(prop[name])
+					? (function (name, fn) {
+							return function () {
+								var tmp = this._super;
 
-						// Add a new ._super() method that is the same method
-						// but on the super-class
-						this._super = _super[name];
+								// Add a new ._super() method that is the same method
+								// but on the super-class
+								this._super = _super[name];
 
-						// The method only need to be bound temporarily, so we
-						// remove it when we're done executing
-						var ret = fn.apply(this, arguments);
-						this._super = tmp;
+								// The method only need to be bound temporarily, so we
+								// remove it when we're done executing
+								var ret = fn.apply(this, arguments);
+								this._super = tmp;
 
-
-						return ret;
-					};
-				})(name, prop[name]) : prop[name];
+								return ret;
+							};
+					  })(name, prop[name])
+					: prop[name];
 		}
 
 		// The dummy class constructor
@@ -92,7 +100,4 @@ function cloneObject(obj) {
 /*************** DO NOT EDIT THE LINE BELOW ***************/
 if (typeof module !== "undefined") {
 	module.exports = Class;
-	module.exports._test = {
-		cloneObject: cloneObject
-	}
 }

js/defaults.js

@@ -1,20 +1,20 @@
-/* exported defaults */
+/* global mmPort */
 
 /* Magic Mirror
- * Config Defauls
+ * Config Defaults
  *
- * By Michael Teeuw http://michaelteeuw.nl
+ * By Michael Teeuw https://michaelteeuw.nl
  * MIT Licensed.
  */
-
-var port = 8080;
 var address = "localhost";
-if (typeof(mmPort) !== "undefined") {
+var port = 8080;
+if (typeof mmPort !== "undefined") {
 	port = mmPort;
 }
 var defaults = {
 	address: address,
 	port: port,
+	basePath: "/",
 	kioskmode: false,
 	electronOptions: {},
 	ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"],
@@ -68,14 +68,16 @@ var defaults = {
 			config: {
 				text: "www.michaelteeuw.nl"
 			}
-		},
+		}
 	],
 
 	paths: {
 		modules: "modules",
 		vendor: "vendor"
-	},
+	}
 };
 
 /*************** DO NOT EDIT THE LINE BELOW ***************/
-if (typeof module !== "undefined") {module.exports = defaults;}
+if (typeof module !== "undefined") {
+	module.exports = defaults;
+}

js/deprecated.js

@@ -1,14 +1,16 @@
 /* Magic Mirror Deprecated Config Options List
  *
- * By Michael Teeuw http://michaelteeuw.nl
+ * By Michael Teeuw https://michaelteeuw.nl
  * MIT Licensed.
  *
  * Olex S. original idea this deprecated option
  */
 
 var deprecated = {
-	configs: ["kioskmode"],
+	configs: ["kioskmode"]
 };
 
 /*************** DO NOT EDIT THE LINE BELOW ***************/
-if (typeof module !== "undefined") {module.exports = deprecated;}
+if (typeof module !== "undefined") {
+	module.exports = deprecated;
+}

js/electron.js

@@ -1,9 +1,8 @@
-/* jshint esversion: 6 */
-
 "use strict";
 
 const electron = require("electron");
-const core = require(__dirname + "/app.js");
+const core = require("./app.js");
+const Log = require("./logger.js");
 
 // Config
 var config = process.env.config ? JSON.parse(process.env.config) : {};
@@ -17,6 +16,7 @@ const BrowserWindow = electron.BrowserWindow;
 let mainWindow;
 
 function createWindow() {
+	app.commandLine.appendSwitch("autoplay-policy", "no-user-gesture-required");
 	var electronOptionsDefaults = {
 		width: 800,
 		height: 600,
@@ -46,8 +46,16 @@ function createWindow() {
 
 	// and load the index.html of the app.
 	// If config.address is not defined or is an empty string (listening on all interfaces), connect to localhost
+
+	var prefix;
+	if (config["tls"] !== null && config["tls"]) {
+		prefix = "https://";
+	} else {
+		prefix = "http://";
+	}
+
 	var address = (config.address === void 0) | (config.address === "") ? (config.address = "localhost") : config.address;
-	mainWindow.loadURL(`http://${address}:${config.port}`);
+	mainWindow.loadURL(`${prefix}${address}:${config.port}`);
 
 	// Open the DevTools if run with "npm start dev"
 	if (process.argv.includes("dev")) {
@@ -55,21 +63,21 @@ function createWindow() {
 	}
 
 	// Set responders for window events.
-	mainWindow.on("closed", function() {
+	mainWindow.on("closed", function () {
 		mainWindow = null;
 	});
 
 	if (config.kioskmode) {
-		mainWindow.on("blur", function() {
+		mainWindow.on("blur", function () {
 			mainWindow.focus();
 		});
 
-		mainWindow.on("leave-full-screen", function() {
+		mainWindow.on("leave-full-screen", function () {
 			mainWindow.setFullScreen(true);
 		});
 
-		mainWindow.on("resize", function() {
-			setTimeout(function() {
+		mainWindow.on("resize", function () {
+			setTimeout(function () {
 				mainWindow.reload();
 			}, 1000);
 		});
@@ -78,17 +86,17 @@ function createWindow() {
 
 // This method will be called when Electron has finished
 // initialization and is ready to create browser windows.
-app.on("ready", function() {
-	console.log("Launching application.");
+app.on("ready", function () {
+	Log.log("Launching application.");
 	createWindow();
 });
 
 // Quit when all windows are closed.
-app.on("window-all-closed", function() {
+app.on("window-all-closed", function () {
 	createWindow();
 });
 
-app.on("activate", function() {
+app.on("activate", function () {
 	// On OS X it's common to re-create a window in the app when the
 	// dock icon is clicked and there are no other windows open.
 	if (mainWindow === null) {
@@ -103,9 +111,11 @@ app.on("activate", function() {
  * core.stop() is called by process.on("SIGINT"... in `app.js`
  */
 app.on("before-quit", (event) => {
-	console.log("Shutting down server...");
+	Log.log("Shutting down server...");
 	event.preventDefault();
-	setTimeout(() => { process.exit(0); }, 3000); // Force-quit after 3 seconds.
+	setTimeout(() => {
+		process.exit(0);
+	}, 3000); // Force-quit after 3 seconds.
 	core.stop();
 	process.exit(0);
 });
@@ -113,7 +123,7 @@ app.on("before-quit", (event) => {
 // Start the core application if server is run on localhost
 // This starts all node helpers and starts the webserver.
 if (["localhost", "127.0.0.1", "::1", "::ffff:127.0.0.1", undefined].indexOf(config.address) > -1) {
-	core.start(function(c) {
+	core.start(function (c) {
 		config = c;
 	});
 }

js/loader.js

@@ -1,14 +1,13 @@
-/* global config, vendor, MM, Log, Module */
+/* global defaultModules, vendor */
+
 /* Magic Mirror
  * Module and File loaders.
  *
- * By Michael Teeuw http://michaelteeuw.nl
+ * By Michael Teeuw https://michaelteeuw.nl
  * MIT Licensed.
  */
-
-var Loader = (function() {
-
-	/* Create helper valiables */
+var Loader = (function () {
+	/* Create helper variables */
 
 	var loadedModuleFiles = [];
 	var loadedFiles = [];
@@ -19,14 +18,13 @@ var Loader = (function() {
 	/* loadModules()
 	 * Loops thru all modules and requests load for every module.
 	 */
-	var loadModules = function() {
-
+	var loadModules = function () {
 		var moduleData = getModuleData();
 
-		var loadNextModule = function() {
+		var loadNextModule = function () {
 			if (moduleData.length > 0) {
 				var nextModule = moduleData[0];
-				loadModule(nextModule, function() {
+				loadModule(nextModule, function () {
 					moduleData = moduleData.slice(1);
 					loadNextModule();
 				});
@@ -35,11 +33,10 @@ var Loader = (function() {
 				// This is done after all the modules so we can
 				// overwrite all the defined styles.
 
-				loadFile(config.customCss, function() {
+				loadFile(config.customCss, function () {
 					// custom.css loaded. Start all modules.
 					startModules();
 				});
-
 			}
 		};
 
@@ -49,13 +46,13 @@ var Loader = (function() {
 	/* startModules()
 	 * Loops thru all modules and requests start for every module.
 	 */
-	var startModules = function() {
+	var startModules = function () {
 		for (var m in moduleObjects) {
 			var module = moduleObjects[m];
 			module.start();
 		}
 
-		// Notifiy core of loded modules.
+		// Notify core of loaded modules.
 		MM.modulesStarted(moduleObjects);
 	};
 
@@ -64,7 +61,7 @@ var Loader = (function() {
 	 *
 	 * return array - module data as configured in config
 	 */
-	var getAllModules = function() {
+	var getAllModules = function () {
 		return config.modules;
 	};
 
@@ -73,7 +70,7 @@ var Loader = (function() {
 	 *
 	 * return array - Module information.
 	 */
-	var getModuleData = function() {
+	var getModuleData = function () {
 		var modules = getAllModules();
 		var moduleFiles = [];
 
@@ -83,10 +80,10 @@ var Loader = (function() {
 
 			var elements = module.split("/");
 			var moduleName = elements[elements.length - 1];
-			var moduleFolder =  config.paths.modules + "/" + module;
+			var moduleFolder = config.paths.modules + "/" + module;
 
 			if (defaultModules.indexOf(moduleName) !== -1) {
-				moduleFolder =  config.paths.modules + "/default/" + module;
+				moduleFolder = config.paths.modules + "/default/" + module;
 			}
 
 			if (moduleData.disabled === true) {
@@ -97,14 +94,13 @@ var Loader = (function() {
 				index: m,
 				identifier: "module_" + m + "_" + module,
 				name: moduleName,
-				path: moduleFolder + "/" ,
+				path: moduleFolder + "/",
 				file: moduleName + ".js",
 				position: moduleData.position,
 				header: moduleData.header,
 				config: moduleData.config,
-				classes: (typeof moduleData.classes !== "undefined") ? moduleData.classes + " " + module : module
+				classes: typeof moduleData.classes !== "undefined" ? moduleData.classes + " " + module : module
 			});
-
 		}
 
 		return moduleFiles;
@@ -116,13 +112,13 @@ var Loader = (function() {
 	 * argument callback function - Function called when done.
 	 * argument module object - Information about the module we want to load.
 	 */
-	var loadModule = function(module, callback) {
+	var loadModule = function (module, callback) {
 		var url = module.path + "/" + module.file;
 
-		var afterLoad = function() {
+		var afterLoad = function () {
 			var moduleObject = Module.create(module.name);
 			if (moduleObject) {
-				bootstrapModule(module, moduleObject, function() {
+				bootstrapModule(module, moduleObject, function () {
 					callback();
 				});
 			} else {
@@ -133,12 +129,11 @@ var Loader = (function() {
 		if (loadedModuleFiles.indexOf(url) !== -1) {
 			afterLoad();
 		} else {
-			loadFile(url, function() {
+			loadFile(url, function () {
 				loadedModuleFiles.push(url);
 				afterLoad();
 			});
 		}
-
 	};
 
 	/* bootstrapModule(module, mObj)
@@ -148,23 +143,22 @@ var Loader = (function() {
 	 * argument mObj object - Modules instance.
 	 * argument callback function - Function called when done.
 	 */
-	var bootstrapModule = function(module, mObj, callback) {
+	var bootstrapModule = function (module, mObj, callback) {
 		Log.info("Bootstrapping module: " + module.name);
 
 		mObj.setData(module);
 
-		mObj.loadScripts(function() {
+		mObj.loadScripts(function () {
 			Log.log("Scripts loaded for: " + module.name);
-			mObj.loadStyles(function() {
+			mObj.loadStyles(function () {
 				Log.log("Styles loaded for: " + module.name);
-				mObj.loadTranslations(function() {
+				mObj.loadTranslations(function () {
 					Log.log("Translations loaded for: " + module.name);
 					moduleObjects.push(mObj);
 					callback();
 				});
 			});
 		});
-
 	};
 
 	/* loadFile(fileName)
@@ -173,53 +167,58 @@ var Loader = (function() {
 	 * argument fileName string - Path of the file we want to load.
 	 * argument callback function - Function called when done.
 	 */
-	var loadFile = function(fileName, callback) {
-
-		var extension =  fileName.slice((Math.max(0, fileName.lastIndexOf(".")) || Infinity) + 1);
+	var loadFile = function (fileName, callback) {
+		var extension = fileName.slice((Math.max(0, fileName.lastIndexOf(".")) || Infinity) + 1);
 
 		switch (extension.toLowerCase()) {
-		case "js":
-			Log.log("Load script: " + fileName);
-			var script = document.createElement("script");
-			script.type = "text/javascript";
-			script.src = fileName;
-			script.onload = function() {
-				if (typeof callback === "function") {callback();}
-			};
-			script.onerror = function() {
-				console.error("Error on loading script:", fileName);
-				if (typeof callback === "function") {callback();}
-			};
+			case "js":
+				Log.log("Load script: " + fileName);
+				var script = document.createElement("script");
+				script.type = "text/javascript";
+				script.src = fileName;
+				script.onload = function () {
+					if (typeof callback === "function") {
+						callback();
+					}
+				};
+				script.onerror = function () {
+					Log.error("Error on loading script:", fileName);
+					if (typeof callback === "function") {
+						callback();
+					}
+				};
 
-			document.getElementsByTagName("body")[0].appendChild(script);
-			break;
-		case "css":
-			Log.log("Load stylesheet: " + fileName);
-			var stylesheet = document.createElement("link");
-			stylesheet.rel = "stylesheet";
-			stylesheet.type = "text/css";
-			stylesheet.href = fileName;
-			stylesheet.onload = function() {
-				if (typeof callback === "function") {callback();}
-			};
-			stylesheet.onerror = function() {
-				console.error("Error on loading stylesheet:", fileName);
-				if (typeof callback === "function") {callback();}
-			};
+				document.getElementsByTagName("body")[0].appendChild(script);
+				break;
+			case "css":
+				Log.log("Load stylesheet: " + fileName);
+				var stylesheet = document.createElement("link");
+				stylesheet.rel = "stylesheet";
+				stylesheet.type = "text/css";
+				stylesheet.href = fileName;
+				stylesheet.onload = function () {
+					if (typeof callback === "function") {
+						callback();
+					}
+				};
+				stylesheet.onerror = function () {
+					Log.error("Error on loading stylesheet:", fileName);
+					if (typeof callback === "function") {
+						callback();
+					}
+				};
 
-			document.getElementsByTagName("head")[0].appendChild(stylesheet);
-			break;
+				document.getElementsByTagName("head")[0].appendChild(stylesheet);
+				break;
 		}
-
 	};
 
 	/* Public Methods */
 	return {
-
 		/* loadModules()
 		 * Load all modules as defined in the config.
 		 */
-		loadModules: function() {
+		loadModules: function () {
 			loadModules();
 		},
 
@@ -231,8 +230,7 @@ var Loader = (function() {
 		 * argument module Module Object - the module that calls the loadFile function.
 		 * argument callback function - Function called when done.
 		 */
-		loadFile: function(fileName, module, callback) {
-
+		loadFile: function (fileName, module, callback) {
 			if (loadedFiles.indexOf(fileName.toLowerCase()) !== -1) {
 				Log.log("File already loaded: " + fileName);
 				callback();
@@ -261,5 +259,4 @@ var Loader = (function() {
 			loadFile(module.file(fileName), callback);
 		}
 	};
-
 })();

js/logger.js

@@ -1,20 +1,27 @@
-/* global console */
-/* exported Log */
-
 /* Magic Mirror
- * Logger
+ * Log
  *
- * By Michael Teeuw http://michaelteeuw.nl
+ * This logger is very simple, but needs to be extended.
+ * This system can eventually be used to push the log messages to an external target.
+ *
+ * By Michael Teeuw https://michaelteeuw.nl
  * MIT Licensed.
  */
+(function (root, factory) {
+	if (typeof exports === "object") {
+		// add timestamps in front of log messages
+		require("console-stamp")(console, "yyyy-mm-dd HH:MM:ss.l");
 
-// This logger is very simple, but needs to be extended.
-// This system can eventually be used to push the log messages to an external target.
-
-var Log = (function() {
-	return {
+		// Node, CommonJS-like
+		module.exports = factory(root.config);
+	} else {
+		// Browser globals (root is window)
+		root.Log = factory(root.config);
+	}
+})(this, function (config) {
+	let logLevel = {
 		info: Function.prototype.bind.call(console.info, console),
-		log:  Function.prototype.bind.call(console.log, console),
+		log: Function.prototype.bind.call(console.log, console),
 		error: Function.prototype.bind.call(console.error, console),
 		warn: Function.prototype.bind.call(console.warn, console),
 		group: Function.prototype.bind.call(console.group, console),
@@ -24,4 +31,14 @@ var Log = (function() {
 		timeEnd: Function.prototype.bind.call(console.timeEnd, console),
 		timeStamp: Function.prototype.bind.call(console.timeStamp, console)
 	};
-})();
+
+	if (config && config.logLevel) {
+		Object.keys(logLevel).forEach(function (key, index) {
+			if (!config.logLevel.includes(key.toLocaleUpperCase())) {
+				logLevel[key] = function () {};
+			}
+		});
+	}
+
+	return logLevel;
+});

js/main.js

@@ -1,15 +1,12 @@
-/* global  Log, Loader, Module, config, defaults */
-/* jshint -W020 */
+/* global Loader, defaults, Translator */
 
 /* Magic Mirror
  * Main System
  *
- * By Michael Teeuw http://michaelteeuw.nl
+ * By Michael Teeuw https://michaelteeuw.nl
  * MIT Licensed.
  */
-
-var MM = (function() {
-
+var MM = (function () {
 	var modules = [];
 
 	/* Private Methods */
@@ -18,43 +15,54 @@ var MM = (function() {
 	 * Create dom objects for all modules that
 	 * are configured for a specific position.
 	 */
-	var createDomObjects = function() {
-		for (var m in modules) {
-			var module = modules[m];
+	var createDomObjects = function () {
+		var domCreationPromises = [];
 
-			if (typeof module.data.position === "string") {
-
-				var wrapper = selectWrapper(module.data.position);
-
-				var dom = document.createElement("div");
-				dom.id = module.identifier;
-				dom.className = module.name;
-
-				if (typeof module.data.classes === "string") {
-					dom.className = "module " + dom.className + " " + module.data.classes;
-				}
-
-				dom.opacity = 0;
-				wrapper.appendChild(dom);
-
-				if (typeof module.data.header !== "undefined" && module.data.header !== "") {
-					var moduleHeader = document.createElement("header");
-					moduleHeader.innerHTML = module.data.header;
-					moduleHeader.className = "module-header";
-					dom.appendChild(moduleHeader);
-				}
-
-				var moduleContent = document.createElement("div");
-				moduleContent.className = "module-content";
-				dom.appendChild(moduleContent);
-
-				updateDom(module, 0);
+		modules.forEach(function (module) {
+			if (typeof module.data.position !== "string") {
+				return;
 			}
-		}
+
+			var wrapper = selectWrapper(module.data.position);
+
+			var dom = document.createElement("div");
+			dom.id = module.identifier;
+			dom.className = module.name;
+
+			if (typeof module.data.classes === "string") {
+				dom.className = "module " + dom.className + " " + module.data.classes;
+			}
+
+			dom.opacity = 0;
+			wrapper.appendChild(dom);
+
+			var moduleHeader = document.createElement("header");
+			moduleHeader.innerHTML = module.getHeader();
+			moduleHeader.className = "module-header";
+			dom.appendChild(moduleHeader);
+
+			if (typeof module.getHeader() === "undefined" || module.getHeader() !== "") {
+				moduleHeader.style = "display: none;";
+			}
+
+			var moduleContent = document.createElement("div");
+			moduleContent.className = "module-content";
+			dom.appendChild(moduleContent);
+
+			var domCreationPromise = updateDom(module, 0);
+			domCreationPromises.push(domCreationPromise);
+			domCreationPromise
+				.then(function () {
+					sendNotification("MODULE_DOM_CREATED", null, null, module);
+				})
+				.catch(Log.error);
+		});
 
 		updateWrapperStates();
 
-		sendNotification("DOM_OBJECTS_CREATED");
+		Promise.all(domCreationPromises).then(function () {
+			sendNotification("DOM_OBJECTS_CREATED");
+		});
 	};
 
 	/* selectWrapper(position)
@@ -62,8 +70,8 @@ var MM = (function() {
 	 *
 	 * argument position string - The name of the position.
 	 */
-	var selectWrapper = function(position) {
-		var classes = position.replace("_"," ");
+	var selectWrapper = function (position) {
+		var classes = position.replace("_", " ");
 		var parentWrapper = document.getElementsByClassName(classes);
 		if (parentWrapper.length > 0) {
 			var wrapper = parentWrapper[0].getElementsByClassName("container");
@@ -79,11 +87,12 @@ var MM = (function() {
 	 * argument notification string - The identifier of the notification.
 	 * argument payload mixed - The payload of the notification.
 	 * argument sender Module - The module that sent the notification.
+	 * argument sendTo Module - The module to send the notification to. (optional)
 	 */
-	var sendNotification = function(notification, payload, sender) {
+	var sendNotification = function (notification, payload, sender, sendTo) {
 		for (var m in modules) {
 			var module = modules[m];
-			if (module !== sender) {
+			if (module !== sender && (!sendTo || module === sendTo)) {
 				module.notificationReceived(notification, payload, sender);
 			}
 		}
@@ -94,43 +103,83 @@ var MM = (function() {
 	 *
 	 * argument module Module - The module that needs an update.
 	 * argument speed Number - The number of microseconds for the animation. (optional)
+	 *
+	 * return Promise - Resolved when the dom is fully updated.
 	 */
-	var updateDom = function(module, speed) {
-		var newContent = module.getDom();
-		var newHeader = module.getHeader();
+	var updateDom = function (module, speed) {
+		return new Promise(function (resolve) {
+			var newContentPromise = module.getDom();
+			var newHeader = module.getHeader();
 
-		if (!module.hidden) {
+			if (!(newContentPromise instanceof Promise)) {
+				// convert to a promise if not already one to avoid if/else's everywhere
+				newContentPromise = Promise.resolve(newContentPromise);
+			}
+
+			newContentPromise
+				.then(function (newContent) {
+					var updatePromise = updateDomWithContent(module, speed, newHeader, newContent);
+
+					updatePromise.then(resolve).catch(Log.error);
+				})
+				.catch(Log.error);
+		});
+	};
+
+	/* updateDomWithContent(module, speed, newHeader, newContent)
+	 * Update the dom with the specified content
+	 *
+	 * argument module Module - The module that needs an update.
+	 * argument speed Number - The number of microseconds for the animation. (optional)
+	 * argument newHeader String - The new header that is generated.
+	 * argument newContent Domobject - The new content that is generated.
+	 *
+	 * return Promise - Resolved when the module dom has been updated.
+	 */
+	var updateDomWithContent = function (module, speed, newHeader, newContent) {
+		return new Promise(function (resolve) {
+			if (module.hidden || !speed) {
+				updateModuleContent(module, newHeader, newContent);
+				resolve();
+				return;
+			}
 
 			if (!moduleNeedsUpdate(module, newHeader, newContent)) {
+				resolve();
 				return;
 			}
 
 			if (!speed) {
 				updateModuleContent(module, newHeader, newContent);
+				resolve();
 				return;
 			}
 
-			hideModule(module, speed / 2, function() {
+			hideModule(module, speed / 2, function () {
 				updateModuleContent(module, newHeader, newContent);
 				if (!module.hidden) {
 					showModule(module, speed / 2);
 				}
+				resolve();
 			});
-		} else {
-			updateModuleContent(module, newHeader, newContent);
-		}
+		});
 	};
 
 	/* moduleNeedsUpdate(module, newContent)
 	 * Check if the content has changed.
 	 *
 	 * argument module Module - The module to check.
+	 * argument newHeader String - The new header that is generated.
 	 * argument newContent Domobject - The new content that is generated.
 	 *
 	 * return bool - Does the module need an update?
 	 */
-	var moduleNeedsUpdate = function(module, newHeader, newContent) {
+	var moduleNeedsUpdate = function (module, newHeader, newContent) {
 		var moduleWrapper = document.getElementById(module.identifier);
+		if (moduleWrapper === null) {
+			return false;
+		}
+
 		var contentWrapper = moduleWrapper.getElementsByClassName("module-content");
 		var headerWrapper = moduleWrapper.getElementsByClassName("module-header");
 
@@ -152,19 +201,22 @@ var MM = (function() {
 	 * Update the content of a module on screen.
 	 *
 	 * argument module Module - The module to check.
+	 * argument newHeader String - The new header that is generated.
 	 * argument newContent Domobject - The new content that is generated.
 	 */
-	var updateModuleContent = function(module, newHeader, newContent) {
+	var updateModuleContent = function (module, newHeader, newContent) {
 		var moduleWrapper = document.getElementById(module.identifier);
+		if (moduleWrapper === null) {
+			return;
+		}
 		var headerWrapper = moduleWrapper.getElementsByClassName("module-header");
 		var contentWrapper = moduleWrapper.getElementsByClassName("module-content");
 
 		contentWrapper[0].innerHTML = "";
 		contentWrapper[0].appendChild(newContent);
 
-		if( headerWrapper.length > 0 && newHeader) {
-			headerWrapper[0].innerHTML = newHeader;
-		}
+		headerWrapper[0].innerHTML = newHeader;
+		headerWrapper[0].style = headerWrapper.length > 0 && newHeader ? undefined : "display: none;";
 	};
 
 	/* hideModule(module, speed, callback)
@@ -174,7 +226,7 @@ var MM = (function() {
 	 * argument speed Number - The speed of the hide animation.
 	 * argument callback function - Called when the animation is done.
 	 */
-	var hideModule = function(module, speed, callback, options) {
+	var hideModule = function (module, speed, callback, options) {
 		options = options || {};
 
 		// set lockString if set in options.
@@ -191,7 +243,7 @@ var MM = (function() {
 			moduleWrapper.style.opacity = 0;
 
 			clearTimeout(module.showHideTimer);
-			module.showHideTimer = setTimeout(function() {
+			module.showHideTimer = setTimeout(function () {
 				// To not take up any space, we just make the position absolute.
 				// since it's fade out anyway, we can see it lay above or
 				// below other modules. This works way better than adjusting
@@ -200,8 +252,15 @@ var MM = (function() {
 
 				updateWrapperStates();
 
-				if (typeof callback === "function") { callback(); }
+				if (typeof callback === "function") {
+					callback();
+				}
 			}, speed);
+		} else {
+			// invoke callback even if no content, issue 1308
+			if (typeof callback === "function") {
+				callback();
+			}
 		}
 	};
 
@@ -212,13 +271,13 @@ var MM = (function() {
 	 * argument speed Number - The speed of the show animation.
 	 * argument callback function - Called when the animation is done.
 	 */
-	var showModule = function(module, speed, callback, options) {
+	var showModule = function (module, speed, callback, options) {
 		options = options || {};
 
 		// remove lockString if set in options.
 		if (options.lockString) {
 			var index = module.lockStrings.indexOf(options.lockString);
-			if ( index !== -1) {
+			if (index !== -1) {
 				module.lockStrings.splice(index, 1);
 			}
 		}
@@ -241,7 +300,7 @@ var MM = (function() {
 		var moduleWrapper = document.getElementById(module.identifier);
 		if (moduleWrapper !== null) {
 			moduleWrapper.style.transition = "opacity " + speed / 1000 + "s";
-			// Restore the postition. See hideModule() for more info.
+			// Restore the position. See hideModule() for more info.
 			moduleWrapper.style.position = "static";
 
 			updateWrapperStates();
@@ -251,17 +310,23 @@ var MM = (function() {
 			moduleWrapper.style.opacity = 1;
 
 			clearTimeout(module.showHideTimer);
-			module.showHideTimer = setTimeout(function() {
-				if (typeof callback === "function") { callback(); }
+			module.showHideTimer = setTimeout(function () {
+				if (typeof callback === "function") {
+					callback();
+				}
 			}, speed);
-
+		} else {
+			// invoke callback
+			if (typeof callback === "function") {
+				callback();
+			}
 		}
 	};
 
 	/* updateWrapperStates()
 	 * Checks for all positions if it has visible content.
 	 * If not, if will hide the position to prevent unwanted margins.
-	 * This method schould be called by the show and hide methods.
+	 * This method should be called by the show and hide methods.
 	 *
 	 * Example:
 	 * If the top_bar only contains the update notification. And no update is available,
@@ -269,17 +334,16 @@ var MM = (function() {
 	 * an ugly top margin. By using this function, the top bar will be hidden if the
 	 * update notification is not visible.
 	 */
-
-	var updateWrapperStates = function() {
+	var updateWrapperStates = function () {
 		var positions = ["top_bar", "top_left", "top_center", "top_right", "upper_third", "middle_center", "lower_third", "bottom_left", "bottom_center", "bottom_right", "bottom_bar", "fullscreen_above", "fullscreen_below"];
 
-		positions.forEach(function(position) {
+		positions.forEach(function (position) {
 			var wrapper = selectWrapper(position);
 			var moduleWrappers = wrapper.getElementsByClassName("module");
 
 			var showWrapper = false;
-			Array.prototype.forEach.call(moduleWrappers, function(moduleWrapper) {
-				if (moduleWrapper.style.position == "" || moduleWrapper.style.position == "static") {
+			Array.prototype.forEach.call(moduleWrappers, function (moduleWrapper) {
+				if (moduleWrapper.style.position === "" || moduleWrapper.style.position === "static") {
 					showWrapper = true;
 				}
 			});
@@ -291,7 +355,9 @@ var MM = (function() {
 	/* loadConfig()
 	 * Loads the core config and combines it with de system defaults.
 	 */
-	var loadConfig = function() {
+	var loadConfig = function () {
+		// FIXME: Think about how to pass config around without breaking tests
+		/* eslint-disable */
 		if (typeof config === "undefined") {
 			config = defaults;
 			Log.error("Config file is missing! Please create a config file.");
@@ -299,6 +365,7 @@ var MM = (function() {
 		}
 
 		config = Object.assign({}, defaults, config);
+		/* eslint-enable */
 	};
 
 	/* setSelectionMethodsForModules()
@@ -306,8 +373,7 @@ var MM = (function() {
 	 *
 	 * argument modules array - Array of modules.
 	 */
-	var setSelectionMethodsForModules = function(modules) {
-
+	var setSelectionMethodsForModules = function (modules) {
 		/* withClass(className)
 		 * calls modulesByClass to filter modules with the specified classes.
 		 *
@@ -315,7 +381,7 @@ var MM = (function() {
 		 *
 		 * return array - Filtered collection of modules.
 		 */
-		var withClass = function(className) {
+		var withClass = function (className) {
 			return modulesByClass(className, true);
 		};
 
@@ -326,7 +392,7 @@ var MM = (function() {
 		 *
 		 * return array - Filtered collection of modules.
 		 */
-		var exceptWithClass  = function(className) {
+		var exceptWithClass = function (className) {
 			return modulesByClass(className, false);
 		};
 
@@ -338,13 +404,13 @@ var MM = (function() {
 		 *
 		 * return array - Filtered collection of modules.
 		 */
-		var modulesByClass = function(className, include) {
+		var modulesByClass = function (className, include) {
 			var searchClasses = className;
 			if (typeof className === "string") {
 				searchClasses = className.split(" ");
 			}
 
-			var newModules = modules.filter(function(module) {
+			var newModules = modules.filter(function (module) {
 				var classes = module.data.classes.toLowerCase().split(" ");
 
 				for (var c in searchClasses) {
@@ -368,8 +434,8 @@ var MM = (function() {
 		 *
 		 * return array - Filtered collection of modules.
 		 */
-		var exceptModule = function(module) {
-			var newModules = modules.filter(function(mod) {
+		var exceptModule = function (module) {
+			var newModules = modules.filter(function (mod) {
 				return mod.identifier !== module.identifier;
 			});
 
@@ -382,16 +448,24 @@ var MM = (function() {
 		 *
 		 * argument callback function - The function to execute with the module as an argument.
 		 */
-		var enumerate = function(callback) {
-			modules.map(function(module) {
+		var enumerate = function (callback) {
+			modules.map(function (module) {
 				callback(module);
 			});
 		};
 
-		if (typeof modules.withClass === "undefined") { Object.defineProperty(modules, "withClass",  {value: withClass, enumerable: false}); }
-		if (typeof modules.exceptWithClass === "undefined") { Object.defineProperty(modules, "exceptWithClass",  {value: exceptWithClass, enumerable: false}); }
-		if (typeof modules.exceptModule === "undefined") { Object.defineProperty(modules, "exceptModule",  {value: exceptModule, enumerable: false}); }
-		if (typeof modules.enumerate === "undefined") { Object.defineProperty(modules, "enumerate",  {value: enumerate, enumerable: false}); }
+		if (typeof modules.withClass === "undefined") {
+			Object.defineProperty(modules, "withClass", { value: withClass, enumerable: false });
+		}
+		if (typeof modules.exceptWithClass === "undefined") {
+			Object.defineProperty(modules, "exceptWithClass", { value: exceptWithClass, enumerable: false });
+		}
+		if (typeof modules.exceptModule === "undefined") {
+			Object.defineProperty(modules, "exceptModule", { value: exceptModule, enumerable: false });
+		}
+		if (typeof modules.enumerate === "undefined") {
+			Object.defineProperty(modules, "enumerate", { value: enumerate, enumerable: false });
+		}
 	};
 
 	return {
@@ -400,7 +474,7 @@ var MM = (function() {
 		/* init()
 		 * Main init method.
 		 */
-		init: function() {
+		init: function () {
 			Log.info("Initializing MagicMirror.");
 			loadConfig();
 			Translator.loadCoreTranslations(config.language);
@@ -412,7 +486,7 @@ var MM = (function() {
 		 *
 		 * argument moduleObjects array<Module> - All module instances.
 		 */
-		modulesStarted: function(moduleObjects) {
+		modulesStarted: function (moduleObjects) {
 			modules = [];
 			for (var m in moduleObjects) {
 				var module = moduleObjects[m];
@@ -428,11 +502,11 @@ var MM = (function() {
 		/* sendNotification(notification, payload, sender)
 		 * Send a notification to all modules.
 		 *
-		 * argument notification string - The identifier of the noitication.
+		 * argument notification string - The identifier of the notification.
 		 * argument payload mixed - The payload of the notification.
 		 * argument sender Module - The module that sent the notification.
 		 */
-		sendNotification: function(notification, payload, sender) {
+		sendNotification: function (notification, payload, sender) {
 			if (arguments.length < 3) {
 				Log.error("sendNotification: Missing arguments.");
 				return;
@@ -458,7 +532,7 @@ var MM = (function() {
 		 * argument module Module - The module that needs an update.
 		 * argument speed Number - The number of microseconds for the animation. (optional)
 		 */
-		updateDom: function(module, speed) {
+		updateDom: function (module, speed) {
 			if (!(module instanceof Module)) {
 				Log.error("updateDom: Sender should be a module.");
 				return;
@@ -473,7 +547,7 @@ var MM = (function() {
 		 *
 		 * return array - A collection of all modules currently active.
 		 */
-		getModules: function() {
+		getModules: function () {
 			setSelectionMethodsForModules(modules);
 			return modules;
 		},
@@ -486,7 +560,7 @@ var MM = (function() {
 		 * argument callback function - Called when the animation is done.
 		 * argument options object - Optional settings for the hide method.
 		 */
-		hideModule: function(module, speed, callback, options) {
+		hideModule: function (module, speed, callback, options) {
 			module.hidden = true;
 			hideModule(module, speed, callback, options);
 		},
@@ -499,18 +573,17 @@ var MM = (function() {
 		 * argument callback function - Called when the animation is done.
 		 * argument options object - Optional settings for the hide method.
 		 */
-		showModule: function(module, speed, callback, options) {
+		showModule: function (module, speed, callback, options) {
 			// do not change module.hidden yet, only if we really show it later
 			showModule(module, speed, callback, options);
 		}
 	};
-
 })();
 
 // Add polyfill for Object.assign.
-if (typeof Object.assign != "function") {
-	(function() {
-		Object.assign = function(target) {
+if (typeof Object.assign !== "function") {
+	(function () {
+		Object.assign = function (target) {
 			"use strict";
 			if (target === undefined || target === null) {
 				throw new TypeError("Cannot convert undefined or null to object");

js/module.js

@@ -1,15 +1,12 @@
-/* global Log, Class, Loader, Class , MM */
-/* exported Module */
+/* global Class, cloneObject, Loader, MMSocket, nunjucks, Translator */
 
 /* Magic Mirror
  * Module Blueprint.
  *
- * By Michael Teeuw http://michaelteeuw.nl
+ * By Michael Teeuw https://michaelteeuw.nl
  * MIT Licensed.
  */
-
 var Module = Class.extend({
-
 	/*********************************************************
 	 * All methods (and properties) below can be subclassed. *
 	 *********************************************************/
@@ -76,36 +73,36 @@ var Module = Class.extend({
 	/* getDom()
 	 * This method generates the dom which needs to be displayed. This method is called by the Magic Mirror core.
 	 * This method can to be subclassed if the module wants to display info on the mirror.
-	 * Alternatively, the getTemplete method could be subclassed.
+	 * Alternatively, the getTemplate method could be subclassed.
 	 *
-	 * return domobject - The dom to display.
+	 * return DomObject | Promise - The dom or a promise with the dom to display.
 	 */
 	getDom: function () {
-		var div = document.createElement("div");
-		var template = this.getTemplate();
-		var templateData = this.getTemplateData();
+		var self = this;
+		return new Promise(function (resolve) {
+			var div = document.createElement("div");
+			var template = self.getTemplate();
+			var templateData = self.getTemplateData();
 
-		// Check to see if we need to render a template string or a file.
-		if (/^.*((\.html)|(\.njk))$/.test(template)) {
-			// the template is a filename
-			this.nunjucksEnvironment().render(template, templateData, function (err, res) {
-				if (err) {
-					Log.error(err)
-				}
+			// Check to see if we need to render a template string or a file.
+			if (/^.*((\.html)|(\.njk))$/.test(template)) {
+				// the template is a filename
+				self.nunjucksEnvironment().render(template, templateData, function (err, res) {
+					if (err) {
+						Log.error(err);
+					}
 
-				// The inner content of the div will be set after the template is received.
-				// This isn't the most optimal way, but since it's near instant
-				// it probably won't be an issue.
-				// If it gives problems, we can always add a way to pre fetch the templates.
-				// Let's not over optimise this ... KISS! :)
-				div.innerHTML = res;
-			});
-		} else {
-			// the template is a template string.
-			div.innerHTML = this.nunjucksEnvironment().renderString(template, templateData);
-		}
+					div.innerHTML = res;
 
-		return div;
+					resolve(div);
+				});
+			} else {
+				// the template is a template string.
+				div.innerHTML = self.nunjucksEnvironment().renderString(template, templateData);
+
+				resolve(div);
+			}
+		});
 	},
 
 	/* getHeader()
@@ -121,14 +118,14 @@ var Module = Class.extend({
 
 	/* getTemplate()
 	 * This method returns the template for the module which is used by the default getDom implementation.
-	 * This method needs to be subclassed if the module wants to use a tempate.
+	 * This method needs to be subclassed if the module wants to use a template.
 	 * It can either return a template sting, or a template filename.
 	 * If the string ends with '.html' it's considered a file from within the module's folder.
 	 *
 	 * return string - The template string of filename.
 	 */
 	getTemplate: function () {
-		return "<div class=\"normal\">" + this.name + "</div><div class=\"small dimmed\">" + this.identifier + "</div>";
+		return '<div class="normal">' + this.name + '</div><div class="small dimmed">' + this.identifier + "</div>";
 	},
 
 	/* getTemplateData()
@@ -138,7 +135,7 @@ var Module = Class.extend({
 	 * return Object
 	 */
 	getTemplateData: function () {
-		return {}
+		return {};
 	},
 
 	/* notificationReceived(notification, payload, sender)
@@ -151,9 +148,9 @@ var Module = Class.extend({
 	 */
 	notificationReceived: function (notification, payload, sender) {
 		if (sender) {
-			Log.log(this.name + " received a module notification: " + notification + " from sender: " + sender.name);
+			// Log.log(this.name + " received a module notification: " + notification + " from sender: " + sender.name);
 		} else {
-			Log.log(this.name + " received a system notification: " + notification);
+			// Log.log(this.name + " received a system notification: " + notification);
 		}
 	},
 
@@ -163,19 +160,19 @@ var Module = Class.extend({
 
 	 * @returns Nunjucks Environment
 	 */
-	nunjucksEnvironment: function() {
-		if (this._nunjucksEnvironment != null) {
+	nunjucksEnvironment: function () {
+		if (this._nunjucksEnvironment !== null) {
 			return this._nunjucksEnvironment;
 		}
 
 		var self = this;
 
-		this._nunjucksEnvironment = new nunjucks.Environment(new nunjucks.WebLoader(this.file(""), {async: true}), {
+		this._nunjucksEnvironment = new nunjucks.Environment(new nunjucks.WebLoader(this.file(""), { async: true }), {
 			trimBlocks: true,
 			lstripBlocks: true
 		});
-		this._nunjucksEnvironment.addFilter("translate", function(str) {
-			return self.translate(str)
+		this._nunjucksEnvironment.addFilter("translate", function (str) {
+			return self.translate(str);
 		});
 
 		return this._nunjucksEnvironment;
@@ -212,7 +209,7 @@ var Module = Class.extend({
 	/* setData(data)
 	 * Set the module data.
 	 *
-	 * argument data obejct - Module data.
+	 * argument data object - Module data.
 	 */
 	setData: function (data) {
 		this.data = data;
@@ -226,19 +223,19 @@ var Module = Class.extend({
 	/* setConfig(config)
 	 * Set the module config and combine it with the module defaults.
 	 *
-	 * argument config obejct - Module config.
+	 * argument config object - Module config.
 	 */
 	setConfig: function (config) {
 		this.config = Object.assign({}, this.defaults, config);
 	},
 
 	/* socket()
-	 * Returns a socket object. If it doesn"t exist, it"s created.
+	 * Returns a socket object. If it doesn't exist, it"s created.
 	 * It also registers the notification callback.
 	 */
 	socket: function () {
 		if (typeof this._socket === "undefined") {
-			this._socket = this._socket = new MMSocket(this.name);
+			this._socket = new MMSocket(this.name);
 		}
 
 		var self = this;
@@ -315,7 +312,9 @@ var Module = Class.extend({
 
 		// The variable `first` will contain the first
 		// defined translation after the following line.
-		for (var first in translations) { break; }
+		for (var first in translations) {
+			break;
+		}
 
 		if (translations) {
 			var translationFile = translations[lang] || undefined;
@@ -339,11 +338,11 @@ var Module = Class.extend({
 	 * Request the translation for a given key with optional variables and default value.
 	 *
 	 * argument key string - The key of the string to translate
-     * argument defaultValueOrVariables string/object - The default value or variables for translating. (Optional)
-     * argument defaultValue string - The default value with variables. (Optional)
+	 * argument defaultValueOrVariables string/object - The default value or variables for translating. (Optional)
+	 * argument defaultValue string - The default value with variables. (Optional)
 	 */
 	translate: function (key, defaultValueOrVariables, defaultValue) {
-		if(typeof defaultValueOrVariables === "object") {
+		if (typeof defaultValueOrVariables === "object") {
 			return Translator.translate(this, key, defaultValueOrVariables) || defaultValue || "";
 		}
 		return Translator.translate(this, key) || defaultValueOrVariables || "";
@@ -388,17 +387,22 @@ var Module = Class.extend({
 	hide: function (speed, callback, options) {
 		if (typeof callback === "object") {
 			options = callback;
-			callback = function () { };
+			callback = function () {};
 		}
 
-		callback = callback || function () { };
+		callback = callback || function () {};
 		options = options || {};
 
 		var self = this;
-		MM.hideModule(self, speed, function () {
-			self.suspend();
-			callback();
-		}, options);
+		MM.hideModule(
+			self,
+			speed,
+			function () {
+				self.suspend();
+				callback();
+			},
+			options
+		);
 	},
 
 	/* showModule(module, speed, callback)
@@ -411,21 +415,28 @@ var Module = Class.extend({
 	show: function (speed, callback, options) {
 		if (typeof callback === "object") {
 			options = callback;
-			callback = function () { };
+			callback = function () {};
 		}
 
-		callback = callback || function () { };
+		callback = callback || function () {};
 		options = options || {};
 
-		this.resume();
-		MM.showModule(this, speed, callback, options);
+		var self = this;
+		MM.showModule(
+			this,
+			speed,
+			function () {
+				self.resume();
+				callback;
+			},
+			options
+		);
 	}
 });
 
 Module.definitions = {};
 
 Module.create = function (name) {
-
 	// Make sure module definition is available.
 	if (!Module.definitions[name]) {
 		return;
@@ -438,15 +449,14 @@ Module.create = function (name) {
 	var ModuleClass = Module.extend(clonedDefinition);
 
 	return new ModuleClass();
-
 };
 
 /* cmpVersions(a,b)
-* Compare two symantic version numbers and return the difference.
-*
-* argument a string - Version number a.
-* argument a string - Version number b.
-*/
+ * Compare two semantic version numbers and return the difference.
+ *
+ * argument a string - Version number a.
+ * argument a string - Version number b.
+ */
 function cmpVersions(a, b) {
 	var i, diff;
 	var regExStrip0 = /(\.0+)+$/;
@@ -464,10 +474,9 @@ function cmpVersions(a, b) {
 }
 
 Module.register = function (name, moduleDefinition) {
-
 	if (moduleDefinition.requiresVersion) {
-		Log.log("Check MagicMirror version for module '" + name + "' - Minimum version:  " + moduleDefinition.requiresVersion + " - Current version: " + version);
-		if (cmpVersions(version, moduleDefinition.requiresVersion) >= 0) {
+		Log.log("Check MagicMirror version for module '" + name + "' - Minimum version:  " + moduleDefinition.requiresVersion + " - Current version: " + window.version);
+		if (cmpVersions(window.version, moduleDefinition.requiresVersion) >= 0) {
 			Log.log("Version is ok!");
 		} else {
 			Log.log("Version is incorrect. Skip module: '" + name + "'");
@@ -477,11 +486,3 @@ Module.register = function (name, moduleDefinition) {
 	Log.log("Module registered: " + name);
 	Module.definitions[name] = moduleDefinition;
 };
-
-if (typeof exports != "undefined") { // For testing purpose only
-	// A good a idea move the function cmpversions a helper file.
-	// It's used into other side.
-	exports._test = {
-		cmpVersions: cmpVersions
-	}
-}

js/node_helper.js

@@ -1,26 +1,25 @@
 /* Magic Mirror
  * Node Helper Superclass
  *
- * By Michael Teeuw http://michaelteeuw.nl
+ * By Michael Teeuw https://michaelteeuw.nl
  * MIT Licensed.
  */
+const Class = require("./class.js");
+const Log = require("./logger.js");
+const express = require("express");
 
-var Class = require("../../../js/class.js");
-var express = require("express");
-var path = require("path");
-
-NodeHelper = Class.extend({
-	init: function() {
-		console.log("Initializing new module helper ...");
+var NodeHelper = Class.extend({
+	init: function () {
+		Log.log("Initializing new module helper ...");
 	},
 
-	loaded: function(callback) {
-		console.log("Module helper loaded: " + this.name);
+	loaded: function (callback) {
+		Log.log("Module helper loaded: " + this.name);
 		callback();
 	},
 
-	start: function() {
-		console.log("Starting module helper: " + this.name);
+	start: function () {
+		Log.log("Starting module helper: " + this.name);
 	},
 
 	/* stop()
@@ -29,8 +28,8 @@ NodeHelper = Class.extend({
 	 * gracefully exit the module.
 	 *
 	 */
-	stop: function() {
-		console.log("Stopping module helper: " + this.name);
+	stop: function () {
+		Log.log("Stopping module helper: " + this.name);
 	},
 
 	/* socketNotificationReceived(notification, payload)
@@ -39,8 +38,8 @@ NodeHelper = Class.extend({
 	 * argument notification string - The identifier of the notification.
 	 * argument payload mixed - The payload of the notification.
 	 */
-	socketNotificationReceived: function(notification, payload) {
-		console.log(this.name + " received a socket notification: " + notification + " - Payload: " + payload);
+	socketNotificationReceived: function (notification, payload) {
+		Log.log(this.name + " received a socket notification: " + notification + " - Payload: " + payload);
 	},
 
 	/* setName(name)
@@ -48,7 +47,7 @@ NodeHelper = Class.extend({
 	 *
 	 * argument name string - Module name.
 	 */
-	setName: function(name) {
+	setName: function (name) {
 		this.name = name;
 	},
 
@@ -57,7 +56,7 @@ NodeHelper = Class.extend({
 	 *
 	 * argument path string - Module path.
 	 */
-	setPath: function(path) {
+	setPath: function (path) {
 		this.path = path;
 	},
 
@@ -67,7 +66,7 @@ NodeHelper = Class.extend({
 	 * argument notification string - The identifier of the notification.
 	 * argument payload mixed - The payload of the notification.
 	 */
-	sendSocketNotification: function(notification, payload) {
+	sendSocketNotification: function (notification, payload) {
 		this.io.of(this.name).emit(notification, payload);
 	},
 
@@ -77,7 +76,7 @@ NodeHelper = Class.extend({
 	 *
 	 * argument app Express app - The Express app object.
 	 */
-	setExpressApp: function(app) {
+	setExpressApp: function (app) {
 		this.expressApp = app;
 
 		var publicPath = this.path + "/public";
@@ -90,36 +89,38 @@ NodeHelper = Class.extend({
 	 *
 	 * argument io Socket.io - The Socket io object.
 	 */
-	setSocketIO: function(io) {
+	setSocketIO: function (io) {
 		var self = this;
 		self.io = io;
 
-		console.log("Connecting socket for: " + this.name);
+		Log.log("Connecting socket for: " + this.name);
 		var namespace = this.name;
-		io.of(namespace).on("connection", function(socket) {
+		io.of(namespace).on("connection", function (socket) {
 			// add a catch all event.
 			var onevent = socket.onevent;
-			socket.onevent = function(packet) {
+			socket.onevent = function (packet) {
 				var args = packet.data || [];
-				onevent.call(this, packet);    // original call
+				onevent.call(this, packet); // original call
 				packet.data = ["*"].concat(args);
-				onevent.call(this, packet);      // additional call to catch-all
+				onevent.call(this, packet); // additional call to catch-all
 			};
 
 			// register catch all.
-			socket.on("*", function(notification, payload) {
+			socket.on("*", function (notification, payload) {
 				if (notification !== "*") {
-					//console.log('received message in namespace: ' + namespace);
+					//Log.log('received message in namespace: ' + namespace);
 					self.socketNotificationReceived(notification, payload);
 				}
 			});
 		});
-
 	}
 });
 
-NodeHelper.create = function(moduleDefinition) {
+NodeHelper.create = function (moduleDefinition) {
 	return NodeHelper.extend(moduleDefinition);
 };
 
-module.exports = NodeHelper;
+/*************** DO NOT EDIT THE LINE BELOW ***************/
+if (typeof module !== "undefined") {
+	module.exports = NodeHelper;
+}

js/server.js

@@ -1,41 +1,51 @@
 /* Magic Mirror
  * Server
  *
- * By Michael Teeuw http://michaelteeuw.nl
+ * By Michael Teeuw https://michaelteeuw.nl
  * MIT Licensed.
  */
-
 var express = require("express");
 var app = require("express")();
-var server = require("http").Server(app);
-var io = require("socket.io")(server);
 var path = require("path");
 var ipfilter = require("express-ipfilter").IpFilter;
 var fs = require("fs");
 var helmet = require("helmet");
-var Utils = require(__dirname + "/utils.js");
 
-var Server = function(config, callback) {
+var Log = require("./logger.js");
+var Utils = require("./utils.js");
 
+var Server = function (config, callback) {
 	var port = config.port;
 	if (process.env.MM_PORT) {
 		port = process.env.MM_PORT;
 	}
 
-	console.log("Starting server on port " + port + " ... ");
+	var server = null;
+	if (config.useHttps) {
+		var options = {
+			key: fs.readFileSync(config.httpsPrivateKey),
+			cert: fs.readFileSync(config.httpsCertificate)
+		};
+		server = require("https").Server(options, app);
+	} else {
+		server = require("http").Server(app);
+	}
+	var io = require("socket.io")(server);
 
-	server.listen(port, config.address ? config.address : null);
+	Log.log("Starting server on port " + port + " ... ");
 
-	if (config.ipWhitelist instanceof Array && config.ipWhitelist.length == 0) {
-		console.info(Utils.colors.warn("You're using a full whitelist configuration to allow for all IPs"))
+	server.listen(port, config.address ? config.address : "localhost");
+
+	if (config.ipWhitelist instanceof Array && config.ipWhitelist.length === 0) {
+		Log.info(Utils.colors.warn("You're using a full whitelist configuration to allow for all IPs"));
 	}
 
-	app.use(function(req, res, next) {
-		var result = ipfilter(config.ipWhitelist, {mode: config.ipWhitelist.length === 0 ? "deny" : "allow", log: false})(req, res, function(err) {
+	app.use(function (req, res, next) {
+		var result = ipfilter(config.ipWhitelist, { mode: config.ipWhitelist.length === 0 ? "deny" : "allow", log: false })(req, res, function (err) {
 			if (err === undefined) {
 				return next();
 			}
-			console.log(err.message);
+			Log.log(err.message);
 			res.status(403).send("This device is not allowed to access your mirror. <br> Please check your config.js or config.js.sample to change this.");
 		});
 	});
@@ -49,21 +59,21 @@ var Server = function(config, callback) {
 		app.use(directory, express.static(path.resolve(global.root_path + directory)));
 	}
 
-	app.get("/version", function(req,res) {
+	app.get("/version", function (req, res) {
 		res.send(global.version);
 	});
 
-	app.get("/config", function(req,res) {
+	app.get("/config", function (req, res) {
 		res.send(config);
 	});
 
-	app.get("/", function(req, res) {
-		var html = fs.readFileSync(path.resolve(global.root_path + "/index.html"), {encoding: "utf8"});
+	app.get("/", function (req, res) {
+		var html = fs.readFileSync(path.resolve(global.root_path + "/index.html"), { encoding: "utf8" });
 		html = html.replace("#VERSION#", global.version);
 
-		configFile = "config/config.js";
-		if (typeof(global.configuration_file) !== "undefined") {
-		    configFile = global.configuration_file;
+		var configFile = "config/config.js";
+		if (typeof global.configuration_file !== "undefined") {
+			configFile = global.configuration_file;
 		}
 		html = html.replace("#CONFIG_FILE#", configFile);
 

js/socket.js

@@ -1,35 +0,0 @@
-/* exported Log */
-
-/* Magic Mirror
- * Socket Connection
- *
- * By Michael Teeuw http://michaelteeuw.nl
- * MIT Licensed.
- */
-
-var MMSocket = function(moduleName) {
-
-	var self = this;
-
-	if (typeof moduleName !== "string") {
-		throw new Error("Please set the module name for the MMSocket.");
-	}
-
-	self.moduleName = moduleName;
-
-	self.socket = io("http://localhost:8080");
-	self.socket.on("notification", function(data) {
-		MM.sendNotification(data.notification, data.payload, Socket);
-	});
-
-	return {
-		sendMessage: function(notification, payload, sender) {
-			Log.log("Send socket message: " + notification);
-			self.socket.emit("notification", {
-				notification: notification,
-				sender: sender,
-				payload: payload
-			});
-		}
-	};
-};

js/socketclient.js

@@ -1,4 +1,12 @@
-var MMSocket = function(moduleName) {
+/* global io */
+
+/* Magic Mirror
+ * TODO add description
+ *
+ * By Michael Teeuw https://michaelteeuw.nl
+ * MIT Licensed.
+ */
+var MMSocket = function (moduleName) {
 	var self = this;
 
 	if (typeof moduleName !== "string") {
@@ -8,30 +16,36 @@ var MMSocket = function(moduleName) {
 	self.moduleName = moduleName;
 
 	// Private Methods
-	self.socket = io("/" + self.moduleName);
-	var notificationCallback = function() {};
+	var base = "/";
+	if (typeof config !== "undefined" && typeof config.basePath !== "undefined") {
+		base = config.basePath;
+	}
+	self.socket = io("/" + self.moduleName, {
+		path: base + "socket.io"
+	});
+	var notificationCallback = function () {};
 
 	var onevent = self.socket.onevent;
-	self.socket.onevent = function(packet) {
+	self.socket.onevent = function (packet) {
 		var args = packet.data || [];
-		onevent.call(this, packet);    // original call
+		onevent.call(this, packet); // original call
 		packet.data = ["*"].concat(args);
-		onevent.call(this, packet);      // additional call to catch-all
+		onevent.call(this, packet); // additional call to catch-all
 	};
 
 	// register catch all.
-	self.socket.on("*", function(notification, payload) {
+	self.socket.on("*", function (notification, payload) {
 		if (notification !== "*") {
 			notificationCallback(notification, payload);
 		}
 	});
 
 	// Public Methods
-	this.setNotificationCallback = function(callback) {
+	this.setNotificationCallback = function (callback) {
 		notificationCallback = callback;
 	};
 
-	this.sendNotification = function(notification, payload) {
+	this.sendNotification = function (notification, payload) {
 		if (typeof payload === "undefined") {
 			payload = {};
 		}

js/translator.js

@@ -1,12 +1,12 @@
-/* exported Translator */
+/* global translations */
+
 /* Magic Mirror
  * Translator (l10n)
  *
- * By Christopher Fenner http://github.com/CFenner
+ * By Christopher Fenner https://github.com/CFenner
  * MIT Licensed.
  */
-var Translator = (function() {
-
+var Translator = (function () {
 	/* loadJSON(file, callback)
 	 * Load a JSON file via XHR.
 	 *
@@ -18,7 +18,7 @@ var Translator = (function() {
 		xhr.overrideMimeType("application/json");
 		xhr.open("GET", file, true);
 		xhr.onreadystatechange = function () {
-			if (xhr.readyState == 4 && xhr.status == "200") {
+			if (xhr.readyState === 4 && xhr.status === 200) {
 				callback(JSON.parse(stripComments(xhr.responseText)));
 			}
 		};
@@ -61,7 +61,7 @@ var Translator = (function() {
 			currentChar = str[i];
 			nextChar = str[i + 1];
 
-			if (!insideComment && currentChar === "\"") {
+			if (!insideComment && currentChar === '"') {
 				var escaped = str[i - 1] === "\\" && str[i - 2] !== "\\";
 				if (!escaped) {
 					insideString = !insideString;
@@ -118,7 +118,7 @@ var Translator = (function() {
 		 * argument key string - The key of the text to translate.
 		 * argument variables - The variables to use within the translation template (optional)
 		 */
-		translate: function(module, key, variables) {
+		translate: function (module, key, variables) {
 			variables = variables || {}; //Empty object by default
 
 			// Combines template and variables like:
@@ -126,15 +126,18 @@ var Translator = (function() {
 			// variables: {timeToWait: "2 hours", work: "painting"}
 			// to: "Please wait for 2 hours before continuing with painting."
 			function createStringFromTemplate(template, variables) {
-				if(variables.fallback && !template.match(new RegExp("\{.+\}"))) {
+				if (Object.prototype.toString.call(template) !== "[object String]") {
+					return template;
+				}
+				if (variables.fallback && !template.match(new RegExp("{.+}"))) {
 					template = variables.fallback;
 				}
-				return template.replace(new RegExp("\{([^\}]+)\}", "g"), function(_unused, varName){
-					return variables[varName] || "{"+varName+"}";
+				return template.replace(new RegExp("{([^}]+)}", "g"), function (_unused, varName) {
+					return variables[varName] || "{" + varName + "}";
 				});
 			}
 
-			if(this.translations[module.name] && key in this.translations[module.name]) {
+			if (this.translations[module.name] && key in this.translations[module.name]) {
 				// Log.log("Got translation for " + key + " from module translation: ");
 				return createStringFromTemplate(this.translations[module.name][key], variables);
 			}
@@ -156,14 +159,16 @@ var Translator = (function() {
 
 			return key;
 		},
-		/* load(module, file, callback)
+
+		/* load(module, file, isFallback, callback)
 		 * Load a translation file (json) and remember the data.
 		 *
 		 * argument module Module - The module to load the translation file for.
 		 * argument file string - Path of the file we want to load.
+		 * argument isFallback boolean - Flag to indicate fallback translations.
 		 * argument callback function - Function called when done.
 		 */
-		load: function(module, file, isFallback, callback) {
+		load: function (module, file, isFallback, callback) {
 			if (!isFallback) {
 				Log.log(module.name + " - Load translation: " + file);
 			} else {
@@ -171,8 +176,8 @@ var Translator = (function() {
 			}
 
 			var self = this;
-			if(!this.translationsFallback[module.name]) {
-				loadJSON(module.file(file), function(json) {
+			if (!this.translationsFallback[module.name]) {
+				loadJSON(module.file(file), function (json) {
 					if (!isFallback) {
 						self.translations[module.name] = json;
 					} else {
@@ -190,12 +195,12 @@ var Translator = (function() {
 		 *
 		 * argument lang String - The language identifier of the core language.
 		 */
-		loadCoreTranslations: function(lang) {
+		loadCoreTranslations: function (lang) {
 			var self = this;
 
 			if (lang in translations) {
 				Log.log("Loading core translation file: " + translations[lang]);
-				loadJSON(translations[lang], function(translations) {
+				loadJSON(translations[lang], function (translations) {
 					self.coreTranslations = translations;
 				});
 			} else {
@@ -209,17 +214,21 @@ var Translator = (function() {
 		 * Load the core translations fallback.
 		 * The first language defined in translations.js will be used.
 		 */
-		loadCoreTranslationsFallback: function() {
+		loadCoreTranslationsFallback: function () {
 			var self = this;
 
 			// The variable `first` will contain the first
 			// defined translation after the following line.
-			for (var first in translations) {break;}
+			for (var first in translations) {
+				break;
+			}
 
-			Log.log("Loading core translation fallback file: " + translations[first]);
-			loadJSON(translations[first], function(translations) {
-				self.coreTranslationsFallback = translations;
-			});
-		},
+			if (first) {
+				Log.log("Loading core translation fallback file: " + translations[first]);
+				loadJSON(translations[first], function (translations) {
+					self.coreTranslationsFallback = translations;
+				});
+			}
+		}
 	};
 })();

js/utils.js

@@ -1,11 +1,9 @@
-/* exported Utils */
 /* Magic Mirror
  * Utils
  *
  * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com
  * MIT Licensed.
  */
-
 var colors = require("colors/safe");
 
 var Utils = {
@@ -16,4 +14,6 @@ var Utils = {
 	}
 };
 
-if (typeof module !== "undefined") {module.exports = Utils;}
+if (typeof module !== "undefined") {
+	module.exports = Utils;
+}

jsconfig.json

@@ -6,8 +6,5 @@
 		"module": "commonjs",
 		"allowSyntheticDefaultImports": true
 	},
-	"exclude": [
-		"modules",
-		"node_modules"
-	]
+	"exclude": ["modules", "node_modules"]
 }

module-types.ts

@@ -0,0 +1,31 @@
+type ModuleProperties = {
+  defaults?: object,
+  start?(): void,
+  getHeader?(): string,
+  getTemplate?(): string,
+  getTemplateData?(): object,
+  notificationReceived?(notification: string, payload: any, sender: object): void,
+  socketNotificationReceived?(notification: string, payload: any): void,
+  suspend?(): void,
+  resume?(): void,
+  getDom?(): HTMLElement,
+  getStyles?(): string[],
+  [key: string]: any,
+};
+
+export declare const Module: {
+  register(moduleName: string, moduleProperties: ModuleProperties): void;
+};
+
+export declare const Log: {
+  info(message?: any, ...optionalParams: any[]): void,
+  log(message?: any, ...optionalParams: any[]): void,
+  error(message?: any, ...optionalParams: any[]): void,
+  warn(message?: any, ...optionalParams: any[]): void,
+  group(groupTitle?: string, ...optionalParams: any[]): void,
+  groupCollapsed(groupTitle?: string, ...optionalParams: any[]): void,
+  groupEnd(): void,
+  time(timerName?: string): void,
+  timeEnd(timerName?: string): void,
+  timeStamp(timerName?: string): void,
+};

modules/README.md

@@ -1,698 +0,0 @@
-# MagicMirror² Module Development Documentation
-
-This document describes the way to develop your own MagicMirror² modules.
-
-## Module structure
-
-All modules are loaded in the `modules` folder. The default modules are grouped together in the `modules/default` folder. Your module should be placed in a subfolder of `modules`. Note that any file or folder your create in the `modules` folder will be ignored by git, allowing you to upgrade the MagicMirror² without the loss of your files.
-
-A module can be placed in one single folder. Or multiple modules can be grouped in a subfolder. Note that name of the module must be unique. Even when a module with a similar name is placed in a different folder, they can't be loaded at the same time.
-
-### Files
-- **modulename/modulename.js** - This is your core module script.
-- **modulename/node_helper.js** - This is an optional helper that will be loaded by the node script. The node helper and module script can communicate with each other using an intergrated socket system.
-- **modulename/public** - Any files in this folder can be accesed via the browser on `/modulename/filename.ext`.
-- **modulename/anyfileorfolder** Any other file or folder in the module folder can be used by the core module script. For example: *modulename/css/modulename.css* would be a good path for your additional module styles.
-
-## Core module file: modulename.js
-This is the script in which the module will be defined. This script is required in order for the module to be used. In it's most simple form, the core module file must contain:
-````javascript
-Module.register("modulename",{});
-````
-Of course, the above module would not do anything fancy, so it's good to look at one of the simplest modules: **helloworld**:
-
-````javascript
-//helloworld.js:
-
-Module.register("helloworld",{
-	// Default module config.
-	defaults: {
-		text: "Hello World!"
-	},
-
-	// Override dom generator.
-	getDom: function() {
-		var wrapper = document.createElement("div");
-		wrapper.innerHTML = this.config.text;
-		return wrapper;
-	}
-});
-````
-
-As you can see, the `Module.register()` method takes two arguments: the name of the module and an object with the module properties.
-
-### Available module instance properties
-After the module is initialized, the module instance has a few available module properties:
-
-#### `this.name`
-**String**
-
-The name of the module.
-
-#### `this.identifier`
-**String**
-
-This is a unique identifier for the module instance.
-
-#### `this.hidden`
-**Boolean**
-
-This represents if the module is currently hidden (faded away).
-
-#### `this.config`
-**Boolean**
-
-The configuration of the module instance as set in the user's config.js file. This config will also contain the module's defaults if these properties are not over written by the user config.
-
-#### `this.data`
-**Object**
-
-The data object contains additional metadata about the module instance:
-- `data.classes` - The classes which are added to the module dom wrapper.
-- `data.file` - The filename of the core module file.
-- `data.path` - The path of the module folder.
-- `data.header` - The header added to the module.
-- `data.position` - The position in which the instance will be shown.
-
-
-#### `defaults: {}`
-Any properties defined in the defaults object, will be merged with the module config as defined in the user's config.js file. This is the best place to set your modules's configuration defaults. Any of the module configuration properties can be accessed using `this.config.propertyName`, but more about that later.
-
-#### `requiresVersion:`
-
-*Introduced in version: 2.1.0.*
-
-A string that defines the minimum version of the MagicMirror framework. If it is set, the system compares the required version with the users version. If the version of the user is out of date, it won't run the module. Make sure to also set this value in the Node helper.
-
-**Note:** Since this check is introduced in version 2.1.0, this check will not be run in older versions. Keep this in mind if you get issue reports on your module.
-
-Example:
-````javascript
-requiresVersion: "2.1.0",
-````
-
-### Subclassable module methods
-
-#### `init()`
-This method is called when a module gets instantiated. In most cases you do not need to subclass this method.
-
-#### `loaded(callback)`
-
-*Introduced in version: 2.1.1.*
-
-This method is called when a module is loaded. Subsequent modules in the config are not yet loaded. The `callback` function MUST be called when the module is done loading. In most cases you do not need to subclass this method.
-
-**Example:**
-````javascript
-loaded: function(callback) {
-	this.finishLoading();
-	Log.log(this.name + ' is loaded!');
-	callback();
-}
-````
-
-#### `start()`
-This method is called when all modules are loaded an the system is ready to boot up. Keep in mind that the dom object for the module is not yet created. The start method is a perfect place to define any additional module properties:
-
-**Example:**
-````javascript
-start: function() {
-	this.mySpecialProperty = "So much wow!";
-	Log.log(this.name + ' is started!');
-}
-````
-
-#### `getScripts()`
-**Should return: Array**
-
-The getScripts method is called to request any additional scripts that need to be loaded. This method should therefore return an array with strings. If you want to return a full path to a file in the module folder, use the `this.file('filename.js')` method. In all cases the loader will only load a file once. It even checks if the file is available in the default vendor folder.
-
-**Example:**
-````javascript
-getScripts: function() {
-	return [
-		'script.js', // will try to load it from the vendor folder, otherwise it will load is from the module folder.
-		'moment.js', // this file is available in the vendor folder, so it doesn't need to be available in the module folder.
-		this.file('anotherfile.js'), // this file will be loaded straight from the module folder.
-		'https://code.jquery.com/jquery-2.2.3.min.js',  // this file will be loaded from the jquery servers.
-	]
-}
-
-````
-**Note:** If a file can not be loaded, the boot up of the mirror will stall. Therefore it's advised not to use any external urls.
-
-
-#### `getStyles()`
-**Should return: Array**
-
-The getStyles method is called to request any additional stylesheets that need to be loaded. This method should therefore return an array with strings. If you want to return a full path to a file in the module folder, use the `this.file('filename.css')` method. In all cases the loader will only load a file once. It even checks if the file is available in the default vendor folder.
-
-**Example:**
-````javascript
-getStyles: function() {
-	return [
-		'script.css', // will try to load it from the vendor folder, otherwise it will load is from the module folder.
-		'font-awesome.css', // this file is available in the vendor folder, so it doesn't need to be avialable in the module folder.
-		this.file('anotherfile.css'), // this file will be loaded straight from the module folder.
-		'https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css',  // this file will be loaded from the bootstrapcdn servers.
-	]
-}
-
-````
-**Note:** If a file can not be loaded, the boot up of the mirror will stall. Therefore it's advised not to use any external urls.
-
-#### `getTranslations()`
-**Should return: Dictionary**
-
-The getTranslations method is called to request translation files that need to be loaded. This method should therefore return a dictionary with the files to load, identified by the country's short name.
-
-If the module does not have any module specific translations, the function can just be omitted or return `false`.
-
-**Example:**
-````javascript
-getTranslations: function() {
-	return {
-			en: "translations/en.json",
-			de: "translations/de.json"
-	}
-}
-
-````
-
-#### `getDom()`
-**Should return:** Dom Object
-
-Whenever the MagicMirror needs to update the information on screen (because it starts, or because your module asked a refresh using `this.updateDom()`), the system calls the getDom method. This method should therefore return a dom object.
-
-**Example:**
-````javascript
-getDom: function() {
-	var wrapper = document.createElement("div");
-	wrapper.innerHTML = 'Hello world!';
-	return wrapper;
-}
-
-````
-
-#### `getHeader()`
-**Should return:** String
-
-Whenever the MagicMirror needs to update the information on screen (because it starts, or because your module asked a refresh using `this.updateDom()`), the system calls the getHeader method to retrieve the module's header. This method should therefor return a string. If this method is not subclassed, this function will return the user's configured header.
-
-If you want to use the original user's configured header, reference `this.data.header`.
-
-**NOTE:** If the user did not configure a default header, no header will be displayed and thus this method will not be called.
-
-**Example:**
-````javascript
-getHeader: function() {
-	return this.data.header + ' Foo Bar';
-}
-
-````
-
-#### `notificationReceived(notification, payload, sender)`
-
-That MagicMirror core has the ability to send notifications to modules. Or even better: the modules have the possibility to send notifications to other modules. When this module is called, it has 3 arguments:
-
-- `notification` - String - The notification identifier.
-- `payload` - AnyType - The payload of a notification.
-- `sender` - Module - The sender of the notification. If this argument is `undefined`, the sender of the notififiction is the core system.
-
-**Example:**
-````javascript
-notificationReceived: function(notification, payload, sender) {
-	if (sender) {
-		Log.log(this.name + " received a module notification: " + notification + " from sender: " + sender.name);
-	} else {
-		Log.log(this.name + " received a system notification: " + notification);
-	}
-}
-````
-
-**Note:** the system sends two notifications when starting up. These notifications could come in handy!
-
-
-- `ALL_MODULES_STARTED` - All modules are started. You can now send notifications to other modules.
-- `DOM_OBJECTS_CREATED` - All dom objects are created. The system is now ready to perform visual changes.
-
-
-#### `socketNotificationReceived: function(notification, payload)`
-When using a node_helper, the node helper can send your module notifications. When this module is called, it has 2 arguments:
-
-- `notification` - String - The notification identifier.
-- `payload` - AnyType - The payload of a notification.
-
-**Note 1:** When a node helper sends a notification, all modules of that module type receive the same notifications. <br>
-**Note 2:** The socket connection is established as soon as the module sends its first message using [sendSocketNotification](thissendsocketnotificationnotification-payload).
-
-**Example:**
-````javascript
-socketNotificationReceived: function(notification, payload) {
-	Log.log(this.name + " received a socket notification: " + notification + " - Payload: " + payload);
-},
-````
-
-#### `suspend()`
-When a module is hidden (using the `module.hide()` method), the `suspend()` method will be called. By subclassing this method you can perform tasks like halting the update timers.
-
-#### `resume()`
-When a module is requested to be shown (using the `module.show()` method), the `resume()` method will be called. By subclassing this method you can perform tasks restarting the update timers.
-
-
-### Module instance methods
-
-Each module instance has some handy methods which can be helpful building your module.
-
-
-#### `this.file(filename)`
-***filename* String** - The name of the file you want to create the path for.<br>
-**Returns String**
-
-If you want to create a path to a file in your module folder, use the `file()` method. It returns the path to the filename given as the attribute. Is method comes in handy when configuring the [getScripts](#getscripts) and [getStyles](#getstyles) methods.
-
-#### `this.updateDom(speed)`
-***speed* Number** - Optional. Animation speed in milliseconds.<br>
-
-Whenever your module need to be updated, call the `updateDom(speed)` method. It requests the MagicMirror core to update its dom object. If you define the speed, the content update will be animated, but only if the content will really change.
-
-As an example: the clock modules calls this method every second:
-
-````javascript
-...
-start: function() {
-	var self = this;
-	setInterval(function() {
-		self.updateDom(); // no speed defined, so it updates instantly.
-	}, 1000); //perform every 1000 milliseconds.
-},
-...
-````
-
-#### `this.sendNotification(notification, payload)`
-***notification* String** - The notification identifier.<br>
-***payload* AnyType** - Optional. A notification payload.<br>
-
-If you want to send a notification to all other modules, use the `sendNotification(notification, payload)`. All other modules will receive the message via the [notificationReceived](#notificationreceivednotification-payload-sender) method. In that case, the sender is automatically set to the instance calling the sendNotification method.
-
-**Example:**
-````javascript
-this.sendNotification('MYMODULE_READY_FOR_ACTION', {foo:bar});
-````
-
-#### `this.sendSocketNotification(notification, payload)`
-***notification* String** - The notification identifier.<br>
-***payload* AnyType** - Optional. A notification payload.<br>
-
-If you want to send a notification to the node_helper, use the `sendSocketNotification(notification, payload)`. Only the node_helper of this module will receive the socket notification.
-
-**Example:**
-````javascript
-this.sendSocketNotification('SET_CONFIG', this.config);
-````
-
-#### `this.hide(speed, callback, options)`
-***speed* Number** - Optional (Required when setting callback or options), The speed of the hide animation in milliseconds.
-***callback* Function** - Optional, The callback after the hide animation is finished.
-***options* Function** - Optional, Object with additional options for the hide action (see below). (*Introduced in version: 2.1.0.*)
-
-To hide a module, you can call the `hide(speed, callback)` method. You can call the hide method on the module instance itself using `this.hide()`, but of course you can also hide another module using `anOtherModule.hide()`.
-
-Possible configurable options:
-
-- `lockString` - String - When setting lock string, the module can not be shown without passing the correct lockstring. This way (multiple) modules can prevent a module from showing. It's considered best practice to use your modules identifier as the locksString: `this.identifier`. See *visibility locking* below.
-
-
-**Note 1:** If the hide animation is canceled, for instance because the show method is called before the hide animation was finished, the callback will not be called.<br>
-**Note 2:** If the hide animation is hijacked (an other method calls hide on the same module), the callback will not be called.<br>
-**Note 3:** If the dom is not yet created, the hide method won't work. Wait for the `DOM_OBJECTS_CREATED` [notification](#notificationreceivednotification-payload-sender).
-
-
-#### `this.show(speed, callback, options)`
-***speed* Number** - Optional (Required when setting callback or options), The speed of the show animation in milliseconds.
-***callback* Function** - Optional, The callback after the show animation is finished.
-***options* Function** - Optional, Object with additional options for the show action (see below). (*Introduced in version: 2.1.0.*)
-
-To show a module, you can call the `show(speed, callback)` method. You can call the show method on the module instance itself using `this.show()`, but of course you can also show another module using `anOtherModule.show()`.
-
-Possible configurable options:
-
-- `lockString` - String - When setting lock string, the module can not be shown without passing the correct lockstring. This way (multiple) modules can prevent a module from showing. See *visibility locking* below.
-- `force` - Boolean - When setting the force tag to `true`, the locking mechanism will be overwritten. Use this option with caution. It's considered best practice to let the usage of the force option be use- configurable. See *visibility locking* below.
-
-**Note 1:** If the show animation is canceled, for instance because the hide method is called before the show animation was finished, the callback will not be called.<br>
-**Note 2:** If the show animation is hijacked (an other method calls show on the same module), the callback will not be called.<br>
-**Note 3:** If the dom is not yet created, the show method won't work. Wait for the `DOM_OBJECTS_CREATED` [notification](#notificationreceivednotification-payload-sender).
-
-#### Visibility locking
-
-(*Introduced in version: 2.1.0.*)
-
-Visiblity locking helps the module system to prevent unwanted hide/show actions. The following scenario explains the concept:
-
-**Module B asks module A to hide:**
-````javascript
-moduleA.hide(0, {lockString: "module_b_identifier"});
-````
-Module A is now hidden, and has an lock array with the following strings:
-````javascript
-moduleA.lockStrings == ["module_b_identifier"]
-moduleA.hidden == true
-````
-**Module C asks module A to hide:**
-````javascript
-moduleA.hide(0, {lockString: "module_c_identifier"});
-````
-Module A is now hidden, and has an lock array with the following strings:
-````javascript
-moduleA.lockStrings == ["module_b_identifier", "module_c_identifier"]
-moduleA.hidden == true
-````
-**Module B asks module A to show:**
-````javascript
-moduleA.show(0, {lockString: "module_b_identifier"});
-````
-The lockString will be removed from moduleA’s locks array, but since there still is an other lock string available, the module remains hidden:
-````javascript
-moduleA.lockStrings == ["module_c_identifier"]
-moduleA.hidden == true
-````
-**Module C asks module A to show:**
-````javascript
-moduleA.show(0, {lockString: "module_c_identifier"});
-````
-The lockString will be removed from moduleA’s locks array, and since this will result in an empty lock array, the module will be visible:
-````javascript
-moduleA.lockStrings == []
-moduleA.hidden == false
-````
-
-**Note:** The locking mechanism can be overwritten by using the force tag:
-````javascript
-moduleA.show(0, {force: true});
-````
-This will reset the lockstring array, and will show the module.
-````javascript
-moduleA.lockStrings == []
-moduleA.hidden == false
-````
-
-Use this `force` method with caution. See `show()` method for more information.
-
-
-
-#### `this.translate(identifier)`
-***identifier* String** - Identifier of the string that should be translated.
-
-The Magic Mirror contains a convenience wrapper for `l18n`. You can use this to automatically serve different translations for your modules based on the user's `language` configuration.
-
-If no translation is found, a fallback will be used. The fallback sequence is as follows:
-- 1. Translation as defined in module translation file of the user's preferred language.
-- 2. Translation as defined in core translation file of the user's preferred language.
-- 3. Translation as defined in module translation file of the fallback language (the first defined module translation file).
-- 4. Translation as defined in core translation file of the fallback language (the first defined core translation file).
-- 5. The key (identifier) of the translation.
-
-When adding translations to your module, it's a good idea to see if an apropriate translation is already available in the [core translation files](https://github.com/MichMich/MagicMirror/tree/master/translations). This way, your module can benefit from the existing translations.
-
-**Example:**
-````javascript
-this.translate("INFO") //Will return a translated string for the identifier INFO
-````
-
-**Example json file:**
-````javascript
-{
-  "INFO": "Really important information!"
-}
-````
-
-**Note:** although comments are officially not supported in JSON files, MagicMirror allows it by stripping the comments before parsing the JSON file. Comments in translation files could help other translators.
-
-##### `this.translate(identifier, variables)`
-***identifier* String** - Identifier of the string that should be translated.
-***variables* Object** - Object of variables to be used in translation.
-
-This improved and backwards compatible way to handle translations behaves like the normal translation function and follows the rules described above. It's recommended to use this new format for translating everywhere. It allows translator to change the word order in the sentence to be translated.
-
-
-**Example:**
-````javascript
-var timeUntilEnd = moment(event.endDate, "x").fromNow(true);
-this.translate("RUNNING", { "timeUntilEnd": timeUntilEnd) }); // Will return a translated string for the identifier RUNNING, replacing `{timeUntilEnd}` with the contents of the variable `timeUntilEnd` in the order that translator intended.
-````
-
-**Example English .json file:**
-````javascript
-{
-	"RUNNING": "Ends in {timeUntilEnd}",
-}
-````
-
-**Example Finnish .json file:**
-````javascript
-{
-	"RUNNING": "Päättyy {timeUntilEnd} päästä",
-}
-````
-
-**Note:** The *variables* Object has an special case called `fallback`. It's used to support old translations in translation files that do not have the variables in them. If you are upgrading an old module that had translations that did not support the word order, it is recommended to have the fallback layout.
-
-**Example:**
-````javascript
-var timeUntilEnd = moment(event.endDate, "x").fromNow(true);
-this.translate("RUNNING", {
-	"fallback": this.translate("RUNNING") + " {timeUntilEnd}"
-	"timeUntilEnd": timeUntilEnd
-)}); // Will return a translated string for the identifier RUNNING, replacing `{timeUntilEnd}` with the contents of the variable `timeUntilEnd` in the order that translator intended. (has a fallback)
-````
-
-**Example swedish .json file that does not have the variable in it:**
-````javascript
-{
-	"RUNNING": "Slutar",
-}
-````
-In this case the `translate`-function will not find any variables in the translation, will look for `fallback` variable and use that if possible to create the translation.
-
-## The Node Helper: node_helper.js
-
-The node helper is a Node.js script that is able to do some backend task to support your module. For every module type, only one node helper instance will be created. For example: if your MagicMirror uses two calendar modules, there will be only one calendar node helper instantiated.
-
-**Note:** Because there is only one node helper per module type, there is no default config available within your module. It's your task to send the desired config from your module to your node helper.
-
-In it's most simple form, the node_helper.js file must contain:
-
-````javascript
-var NodeHelper = require("node_helper");
-module.exports = NodeHelper.create({});
-````
-
-Of course, the above helper would not do anything useful. So with the information above, you should be able to make it a bit more sophisticated.
-
-### Available module instance properties
-
-#### `this.name`
-**String**
-
-The name of the module
-
-#### `this.path`
-**String**
-
-The path of the module
-
-#### `this.expressApp`
-**Express App Instance**
-
-This is a link to the express instance. It will allow you to define extra routes.
-
-**Example:**
-````javascript
-start: function() {
-	this.expressApp.get('/foobar', function (req, res) {
-		res.send('GET request to /foobar');
-	});
-}
-````
-
-**Note:** By default, a public path to your module's public folder will be created:
-````javascript
-this.expressApp.use("/" + this.name, express.static(this.path + "/public"));
-````
-
-#### `this.io`
-**Socket IO Instance**
-
-This is a link to the IO instance. It will allow you to do some Socket.IO magic. In most cases you won't need this, since the Node Helper has a few convenience methods to make this simple.
-
-
-#### `requiresVersion:`
-*Introduced in version: 2.1.0.*
-
-A string that defines the minimum version of the MagicMirror framework. If it is set, the system compares the required version with the users version. If the version of the user is out of date, it won't run the module.
-
-**Note:** Since this check is introduced in version 2.1.0, this check will not be run in older versions. Keep this in mind if you get issue reports on your module.
-
-Example:
-````javascript
-requiresVersion: "2.1.0",
-````
-
-### Subclassable module methods
-
-#### `init()`
-This method is called when a node helper gets instantiated. In most cases you do not need to subclass this method.
-
-#### `start()`
-This method is called when all node helpers are loaded and the system is ready to boot up. The start method is a perfect place to define any additional module properties:
-
-**Example:**
-````javascript
-start: function() {
-	this.mySpecialProperty = "So much wow!";
-	Log.log(this.name + ' is started!');
-}
-````
-
-#### `stop()`
-This method is called when the MagicMirror server receives a `SIGINT` command and is shutting down. This method should include any commands needed to close any open connections, stop any sub-processes and gracefully exit the module.
-
-**Example:**
-````javascript
-stop: function() {
-	console.log("Shutting down MyModule");
-	this.connection.close();
-}
-````
-
-#### `socketNotificationReceived: function(notification, payload)`
-With this method, your node helper can receive notifications from your modules. When this method is called, it has 2 arguments:
-
-- `notification` - String - The notification identifier.
-- `payload` - AnyType - The payload of a notification.
-
-**Note:** The socket connection is established as soon as the module sends its first message using [sendSocketNotification](thissendsocketnotificationnotification-payload).
-
-**Example:**
-````javascript
-socketNotificationReceived: function(notification, payload) {
-	Log.log(this.name + " received a socket notification: " + notification + " - Payload: " + payload);
-},
-````
-
-### Module instance methods
-
-Each node helper has some handy methods which can be helpful building your module.
-
-#### `this.sendSocketNotification(notification, payload)`
-***notification* String** - The notification identifier.<br>
-***payload* AnyType** - Optional. A notification payload.<br>
-
-If you want to send a notification to all your modules, use the `sendSocketNotification(notification, payload)`. Only the module of your module type will receive the socket notification.
-
-**Note:** Since all instances of your module will receive the notifications, it's your task to make sure the right module responds to your messages.
-
-**Example:**
-````javascript
-this.sendSocketNotification('SET_CONFIG', this.config);
-````
-
-## MagicMirror Helper Methods
-
-The core Magic Mirror object: `MM` has some handy method that will help you in controlling your and other modules. Most of the `MM` methods are available via convenience methods on the Module instance.
-
-### Module selection
-The only additional method available for your module, is the feature to retrieve references to other modules. This can be used to hide and show other modules.
-
-#### `MM.getModules()`
-**Returns Array** - An array with module instances.<br>
-
-To make a selection of all currently loaded module instances, run the `MM.getModules()` method. It will return an array with all currently loaded module instances. The returned array has a lot of filtering methods. See below for more info.
-
-**Note:** This method returns an empty array if not all modules are started yet. Wait for the `ALL_MODULES_STARTED` [notification](#notificationreceivednotification-payload-sender).
-
-
-##### `.withClass(classnames)`
-***classnames* String or Array** - The class names on which you want to filter.
-**Returns Array** - An array with module instances.<br>
-
-If you want to make a selection based on one or more class names, use the withClass method on a result of the `MM.getModules()` method. The argument of the `withClass(classname)` method can be an array, or space separated string.
-
-**Examples:**
-````javascript
-var modules = MM.getModules().withClass('classname');
-var modules = MM.getModules().withClass('classname1 classname2');
-var modules = MM.getModules().withClass(['classname1','classname2']);
-````
-
-##### `.exceptWithClass(classnames)`
-***classnames* String or Array** - The class names of the modules you want to remove from the results.
-**Returns Array** - An array with module instances.<br>
-
-If you to remove some modules from a selection based on a classname, use the exceptWithClass method on a result of the `MM.getModules()` method. The argument of the `exceptWithClass(classname)` method can be an array, or space separated string.
-
-**Examples:**
-````javascript
-var modules = MM.getModules().exceptWithClass('classname');
-var modules = MM.getModules().exceptWithClass('classname1 classname2');
-var modules = MM.getModules().exceptWithClass(['classname1','classname2']);
-````
-
-##### `.exceptModule(module)`
-***module* Module Object** - The reference to a module you want to remove from the results.
-**Returns Array** - An array with module instances.<br>
-
-If you to remove a specific module instance from a selection based on a classname, use the exceptWithClass method on a result of the `MM.getModules()` method. This can be helpful if you want to select all module instances except the instance of your module.
-
-**Examples:**
-````javascript
-var modules = MM.getModules().exceptModule(this);
-````
-
-Of course, you can combine all of the above filters:
-
-**Example:**
-````javascript
-var modules = MM.getModules().withClass('classname1').exceptwithClass('classname2').exceptModule(aModule);
-````
-
-##### `.enumerate(callback)`
-***callback* Function(module)** - The callback run on every instance.
-
-If you want to perform an action on all selected modules, you can use the `enumerate` function:
-
-````javascript
-MM.getModules().enumerate(function(module) {
-    Log.log(module.name);
-});
-````
-
-**Example:**
-To hide all modules except the your module instance, you could write something like:
-````javascript
-Module.register("modulename",{
-	//...
-	notificationReceived: function(notification, payload, sender) {
-		if (notification === 'DOM_OBJECTS_CREATED') {
-			MM.getModules().exceptModule(this).enumerate(function(module) {
-				module.hide(1000, function() {
-					//Module hidden.
-				});
-			});
-		}
-	},
-	//...
-});
-````
-
-## MagicMirror Logger
-
-The Magic Mirror contains a convenience wrapper for logging. Currently, this logger is a simple proxy to the original `console.log` methods. But it might get additional features in the future. The Loggers is currently only available in the core module file (not in the node_helper).
-
-**Examples:**
-````javascript
-Log.info('error');
-Log.log('log');
-Log.error('info');
-````

modules/default/alert/README.md

@@ -1,64 +1,5 @@
 # Module: Alert
+
 The alert module is one of the default modules of the MagicMirror. This module displays notifications from other modules.
 
-## Usage
-To use this module, add it to the modules array in the config/config.js file:
-
-```
-modules: [
-	{
-		module: "alert",
-		config: {
-			// The config property is optional.
-			// See 'Configuration options' for more information.
-		}
-	}
-]
-```
-
-## Configuration options
-
-The following properties can be configured:
-
-
-| Option            | Description
-| ----------------- | -----------
-| `effect`          | The animation effect to use for notifications. <br><br> **Possible values:** `scale` `slide` `genie` `jelly` `flip` `exploader` `bouncyflip` <br> **Default value:** `slide`
-| `alert_effect`    | The animation effect to use for alerts. <br><br> **Possible values:** `scale` `slide` `genie` `jelly` `flip` `exploader` `bouncyflip` <br> **Default value:** `jelly`
-| `display_time`    | Time a notification is displayed in milliseconds. <br><br> **Possible values:** `int` <br> **Default value:** `3500`
-| `position`        | Position where the notifications should be displayed. <br><br> **Possible values:** `left` `center` `right` <br> **Default value:** `center`
-| `welcome_message` | Message shown at startup. <br><br> **Possible values:** `string` `false` <br> **Default value:** `false` (no message at startup)
-
-
-## Developer notes
-For notifications use:
-
-```
-self.sendNotification("SHOW_ALERT", {type: "notification"});
-```
-For alerts use:
-
-```
-self.sendNotification("SHOW_ALERT", {});
-```
-
-### Notification params
-| Option    | Description
-| --------- | -----------
-| `title`   | The title of the notification. <br><br> **Possible values:** `text` or `html`
-| `message`	| The message of the notification. <br><br> **Possible values:** `text` or `html`
-
-
-### Alert params
-| Option                                          | Description
-| ----------------------------------------------- | -----------
-| `title`                                         | The title of the alert. <br><br> **Possible values:** `text` or `html`
-| `message`                                       | The message of the alert. <br><br> **Possible values:** `text` or `html`
-| `imageUrl` (optional)                           | Image to show in the alert <br><br> **Possible values:** `url` `path` <br> **Default value:** `none`
-| `imageFA` (optional)                            | Font Awesome icon to show in the alert <br><br> **Possible values:** See [Font Awsome](http://fontawesome.io/icons/) website. <br> **Default value:** `none`
-| `imageHeight` (optional even with imageUrl set) | Height of the image <br><br> **Possible values:** `intpx` <br> **Default value:** `80px`
-| `timer` (optional)                              | How long the alert should stay visible in ms. <br> **Important:** If you do not use the `timer`, it is your duty to hide the alert by using `self.sendNotification("HIDE_ALERT");`! <br><br>**Possible values:** `int` `float` <br> **Default value:** `none`
-
-## Open Source Licenses
-###[NotificationStyles](https://github.com/codrops/NotificationStyles)
-See [ympanus.net](http://tympanus.net/codrops/licensing/) for license.
+For configuration options, please check the [MagicMirror² documentation](https://docs.magicmirror.builders/modules/alert.html).

modules/default/alert/alert.js

@@ -1,13 +1,12 @@
-/* global Module */
+/* global NotificationFx */
 
 /* Magic Mirror
  * Module: alert
  *
- * By Paul-Vincent Roll http://paulvincentroll.com
+ * By Paul-Vincent Roll https://paulvincentroll.com/
  * MIT Licensed.
  */
-
-Module.register("alert",{
+Module.register("alert", {
 	defaults: {
 		// scale|slide|genie|jelly|flip|bouncyflip|exploader
 		effect: "slide",
@@ -18,59 +17,64 @@ Module.register("alert",{
 		//Position
 		position: "center",
 		//shown at startup
-		welcome_message: false,
+		welcome_message: false
 	},
-	getScripts: function() {
-		return ["classie.js", "modernizr.custom.js", "notificationFx.js"];
+	getScripts: function () {
+		return ["notificationFx.js"];
 	},
-	getStyles: function() {
-		return ["ns-default.css"];
+	getStyles: function () {
+		return ["notificationFx.css", "font-awesome.css"];
 	},
 	// Define required translations.
-	getTranslations: function() {
+	getTranslations: function () {
 		return {
 			en: "translations/en.json",
 			de: "translations/de.json",
-			nl: "translations/nl.json",
+			nl: "translations/nl.json"
 		};
 	},
-	show_notification: function(message) {
-		if (this.config.effect == "slide") {this.config.effect = this.config.effect + "-" + this.config.position;}
-		msg = "";
-		if (message.title) {
-			msg += "<span class='thin' style='line-height: 35px; font-size:24px' color='#4A4A4A'>" + message.title + "</span>";
+	show_notification: function (message) {
+		if (this.config.effect === "slide") {
+			this.config.effect = this.config.effect + "-" + this.config.position;
 		}
-		if (message.message){
-			if (msg != ""){
-				msg+= "<br />";
+		let msg = "";
+		if (message.title) {
+			msg += "<span class='thin dimmed medium'>" + message.title + "</span>";
+		}
+		if (message.message) {
+			if (msg !== "") {
+				msg += "<br />";
 			}
-			msg += "<span class='light' style='font-size:28px;line-height: 30px;'>" + message.message + "</span>";
+			msg += "<span class='light bright small'>" + message.message + "</span>";
 		}
 
 		new NotificationFx({
 			message: msg,
 			layout: "growl",
 			effect: this.config.effect,
-			ttl: this.config.display_time
+			ttl: message.timer !== undefined ? message.timer : this.config.display_time
 		}).show();
 	},
-	show_alert: function(params, sender) {
-		var self = this;
+	show_alert: function (params, sender) {
+		let image = "";
 		//Set standard params if not provided by module
-		if (typeof params.timer === "undefined") { params.timer = null; }
-		if (typeof params.imageHeight === "undefined") { params.imageHeight = "80px"; }
+		if (typeof params.timer === "undefined") {
+			params.timer = null;
+		}
+		if (typeof params.imageHeight === "undefined") {
+			params.imageHeight = "80px";
+		}
 		if (typeof params.imageUrl === "undefined" && typeof params.imageFA === "undefined") {
 			params.imageUrl = null;
-			image = "";
-		} else if (typeof params.imageFA === "undefined"){
-			image = "<img src='" + (params.imageUrl).toString() + "' height=" + (params.imageHeight).toString() + " style='margin-bottom: 10px;'/><br />";
-		} else if (typeof params.imageUrl === "undefined"){
-			image = "<span class='" + "fa fa-" + params.imageFA + "' style='margin-bottom: 10px;color: #fff;font-size:" + (params.imageHeight).toString() + ";'/></span><br />";
+		} else if (typeof params.imageFA === "undefined") {
+			image = "<img src='" + params.imageUrl.toString() + "' height='" + params.imageHeight.toString() + "' style='margin-bottom: 10px;'/><br />";
+		} else if (typeof params.imageUrl === "undefined") {
+			image = "<span class='bright " + "fa fa-" + params.imageFA + "' style='margin-bottom: 10px;font-size:" + params.imageHeight.toString() + ";'/></span><br />";
 		}
 		//Create overlay
-		var overlay = document.createElement("div");
+		const overlay = document.createElement("div");
 		overlay.id = "overlay";
-		overlay.innerHTML += "<div class=\"black_overlay\"></div>";
+		overlay.innerHTML += '<div class="black_overlay"></div>';
 		document.body.insertBefore(overlay, document.body.firstChild);
 
 		//If module already has an open alert close it
@@ -79,16 +83,16 @@ Module.register("alert",{
 		}
 
 		//Display title and message only if they are provided in notification parameters
-		message ="";
+		let message = "";
 		if (params.title) {
-			message += "<span class='light' style='line-height: 35px; font-size:30px' color='#4A4A4A'>" + params.title + "</span>"
+			message += "<span class='light dimmed medium'>" + params.title + "</span>";
 		}
 		if (params.message) {
-			if (message != ""){
+			if (message !== "") {
 				message += "<br />";
 			}
 
-			message += "<span class='thin' style='font-size:22px;line-height: 30px;'>" + params.message + "</span>";
+			message += "<span class='thin bright small'>" + params.message + "</span>";
 		}
 
 		//Store alert in this.alerts
@@ -102,53 +106,59 @@ Module.register("alert",{
 		this.alerts[sender.name].show();
 		//Add timer to dismiss alert and overlay
 		if (params.timer) {
-			setTimeout(function() {
-				self.hide_alert(sender);
+			setTimeout(() => {
+				this.hide_alert(sender);
 			}, params.timer);
 		}
-
 	},
-	hide_alert: function(sender) {
+	hide_alert: function (sender) {
 		//Dismiss alert and remove from this.alerts
-		this.alerts[sender.name].dismiss();
-		this.alerts[sender.name] = null;
-		//Remove overlay
-		var overlay = document.getElementById("overlay");
-		overlay.parentNode.removeChild(overlay);
+		if (this.alerts[sender.name]) {
+			this.alerts[sender.name].dismiss();
+			this.alerts[sender.name] = null;
+			//Remove overlay
+			const overlay = document.getElementById("overlay");
+			overlay.parentNode.removeChild(overlay);
+		}
 	},
-	setPosition: function(pos) {
+	setPosition: function (pos) {
 		//Add css to body depending on the set position for notifications
-		var sheet = document.createElement("style");
-		if (pos == "center") {sheet.innerHTML = ".ns-box {margin-left: auto; margin-right: auto;text-align: center;}";}
-		if (pos == "right") {sheet.innerHTML = ".ns-box {margin-left: auto;text-align: right;}";}
-		if (pos == "left") {sheet.innerHTML = ".ns-box {margin-right: auto;text-align: left;}";}
+		const sheet = document.createElement("style");
+		if (pos === "center") {
+			sheet.innerHTML = ".ns-box {margin-left: auto; margin-right: auto;text-align: center;}";
+		}
+		if (pos === "right") {
+			sheet.innerHTML = ".ns-box {margin-left: auto;text-align: right;}";
+		}
+		if (pos === "left") {
+			sheet.innerHTML = ".ns-box {margin-right: auto;text-align: left;}";
+		}
 		document.body.appendChild(sheet);
-
 	},
-	notificationReceived: function(notification, payload, sender) {
+	notificationReceived: function (notification, payload, sender) {
 		if (notification === "SHOW_ALERT") {
-			if (typeof payload.type === "undefined") { payload.type = "alert"; }
-			if (payload.type == "alert") {
+			if (typeof payload.type === "undefined") {
+				payload.type = "alert";
+			}
+			if (payload.type === "alert") {
 				this.show_alert(payload, sender);
-			} else if (payload.type = "notification") {
+			} else if (payload.type === "notification") {
 				this.show_notification(payload);
 			}
 		} else if (notification === "HIDE_ALERT") {
 			this.hide_alert(sender);
 		}
 	},
-	start: function() {
+	start: function () {
 		this.alerts = {};
 		this.setPosition(this.config.position);
 		if (this.config.welcome_message) {
-			if (this.config.welcome_message == true){
-				this.show_notification({title: this.translate("sysTitle"), message: this.translate("welcome")});
-			}
-			else{
-				this.show_notification({title: this.translate("sysTitle"), message: this.config.welcome_message});
+			if (this.config.welcome_message === true) {
+				this.show_notification({ title: this.translate("sysTitle"), message: this.translate("welcome") });
+			} else {
+				this.show_notification({ title: this.translate("sysTitle"), message: this.config.welcome_message });
 			}
 		}
 		Log.info("Starting module: " + this.name);
 	}
-
 });

modules/default/alert/classie.js

@@ -1,79 +0,0 @@
-/*!
- * classie - class helper functions
- * from bonzo https://github.com/ded/bonzo
- *
- * classie.has( elem, 'my-class' ) -> true/false
- * classie.add( elem, 'my-new-class' )
- * classie.remove( elem, 'my-unwanted-class' )
- * classie.toggle( elem, 'my-class' )
- */
-// jscs:disable
-/*jshint browser: true, strict: true, undef: true */
-/*global define: false */
-
-(function(window) {
-
-"use strict";
-
-// class helper functions from bonzo https://github.com/ded/bonzo
-
-function classReg(className) {
-	return new RegExp("(^|\\s+)" + className + "(\\s+|$)");
-}
-
-// classList support for class management
-// altho to be fair, the api sucks because it won't accept multiple classes at once
-var hasClass, addClass, removeClass;
-
-if ("classList" in document.documentElement) {
-	hasClass = function(elem, c) {
-		return elem.classList.contains(c);
-	};
-	addClass = function(elem, c) {
-		elem.classList.add(c);
-	};
-	removeClass = function(elem, c) {
-		elem.classList.remove(c);
-	};
-} else {
-	hasClass = function(elem, c) {
-		return classReg(c).test(elem.className);
-	};
-	addClass = function(elem, c) {
-		if (!hasClass(elem, c)) {
-			elem.className = elem.className + " " + c;
-		}
-	};
-	removeClass = function(elem, c) {
-		elem.className = elem.className.replace(classReg(c), " ");
-	};
-}
-
-function toggleClass(elem, c) {
-	var fn = hasClass(elem, c) ? removeClass : addClass;
-	fn(elem, c);
-}
-
-var classie = {
-	// full names
-	hasClass: hasClass,
-	addClass: addClass,
-	removeClass: removeClass,
-	toggleClass: toggleClass,
-	// short names
-	has: hasClass,
-	add: addClass,
-	remove: removeClass,
-	toggle: toggleClass
-};
-
-// transport
-if (typeof define === "function" && define.amd) {
-	// AMD
-	define(classie);
-} else {
-	// browser global
-	window.classie = classie;
-}
-
-})(window);

modules/default/alert/notificationFx.css

@@ -0,0 +1,933 @@
+/* Based on work by https://tympanus.net/codrops/licensing/ */
+
+.ns-box {
+  background-color: rgba(0, 0, 0, 0.93);
+  padding: 17px;
+  line-height: 1.4;
+  margin-bottom: 10px;
+  z-index: 1;
+  color: black;
+  font-size: 70%;
+  position: relative;
+  display: table;
+  word-wrap: break-word;
+  max-width: 100%;
+  border-width: 1px;
+  border-radius: 5px;
+  border-style: solid;
+  border-color: #666;
+}
+
+.ns-alert {
+  border-style: solid;
+  border-color: #fff;
+  padding: 17px;
+  line-height: 1.4;
+  margin-bottom: 10px;
+  z-index: 3;
+  color: white;
+  font-size: 70%;
+  position: fixed;
+  text-align: center;
+  right: 0;
+  left: 0;
+  margin-right: auto;
+  margin-left: auto;
+  top: 40%;
+  width: 40%;
+  height: auto;
+  word-wrap: break-word;
+  border-radius: 20px;
+}
+
+.black_overlay {
+  position: fixed;
+  z-index: 2;
+  background-color: rgba(0, 0, 0, 0.93);
+  width: 100%;
+  height: 100%;
+}
+
+[class^="ns-effect-"].ns-growl.ns-hide,
+[class*=" ns-effect-"].ns-growl.ns-hide {
+  animation-direction: reverse;
+}
+
+.ns-effect-flip {
+  transform-origin: 50% 100%;
+  backface-visibility: hidden;
+}
+
+.ns-effect-flip.ns-show,
+.ns-effect-flip.ns-hide {
+  animation-name: animFlipFront;
+  animation-duration: 0.3s;
+}
+
+.ns-effect-flip.ns-hide {
+  animation-name: animFlipBack;
+}
+
+@keyframes animFlipFront {
+  0% {
+    transform: perspective(1000px) rotate3d(1, 0, 0, -90deg);
+  }
+
+  100% {
+    transform: perspective(1000px);
+  }
+}
+
+@keyframes animFlipBack {
+  0% {
+    transform: perspective(1000px) rotate3d(1, 0, 0, 90deg);
+  }
+
+  100% {
+    transform: perspective(1000px);
+  }
+}
+
+.ns-effect-bouncyflip.ns-show,
+.ns-effect-bouncyflip.ns-hide {
+  animation-name: flipInX;
+  animation-duration: 0.8s;
+}
+
+@keyframes flipInX {
+  0% {
+    transform: perspective(400px) rotate3d(1, 0, 0, -90deg);
+    transition-timing-function: ease-in;
+  }
+
+  40% {
+    transform: perspective(400px) rotate3d(1, 0, 0, 20deg);
+    transition-timing-function: ease-out;
+  }
+
+  60% {
+    transform: perspective(400px) rotate3d(1, 0, 0, -10deg);
+    transition-timing-function: ease-in;
+    opacity: 1;
+  }
+
+  80% {
+    transform: perspective(400px) rotate3d(1, 0, 0, 5deg);
+    transition-timing-function: ease-out;
+  }
+
+  100% {
+    transform: perspective(400px);
+  }
+}
+
+.ns-effect-bouncyflip.ns-hide {
+  animation-name: flipInXSimple;
+  animation-duration: 0.3s;
+}
+
+@keyframes flipInXSimple {
+  0% {
+    transform: perspective(400px) rotate3d(1, 0, 0, -90deg);
+    transition-timing-function: ease-in;
+  }
+
+  100% {
+    transform: perspective(400px);
+  }
+}
+
+.ns-effect-exploader {
+  transform-origin: 0 0;
+}
+
+.ns-effect-exploader p {
+  padding: 0.25em 2em 0.25em 3em;
+}
+
+.ns-effect-exploader.ns-show {
+  animation-name: animLoad;
+  animation-duration: 1s;
+}
+
+@keyframes animLoad {
+  0% {
+    opacity: 1;
+    transform: scale3d(0, 0.3, 1);
+  }
+
+  100% {
+    opacity: 1;
+    transform: scale3d(1, 1, 1);
+  }
+}
+
+.ns-effect-exploader.ns-hide {
+  animation-name: animFade;
+  animation-duration: 0.3s;
+}
+
+.ns-effect-exploader.ns-show .ns-box-inner,
+.ns-effect-exploader.ns-show .ns-close {
+  animation-fill-mode: both;
+  animation-duration: 0.3s;
+  animation-delay: 0.6s;
+}
+
+.ns-effect-exploader.ns-show .ns-close {
+  animation-name: animFade;
+}
+
+.ns-effect-exploader.ns-show .ns-box-inner {
+  animation-name: animFadeMove;
+  animation-timing-function: ease-out;
+}
+
+@keyframes animFadeMove {
+  0% {
+    opacity: 0;
+    transform: translate3d(0, 10px, 0);
+  }
+
+  100% {
+    opacity: 1;
+    transform: translate3d(0, 0, 0);
+  }
+}
+
+@keyframes animFade {
+  0% {
+    opacity: 0;
+  }
+
+  100% {
+    opacity: 1;
+  }
+}
+
+.ns-effect-scale.ns-show,
+.ns-effect-scale.ns-hide {
+  animation-name: animScale;
+  animation-duration: 0.25s;
+}
+
+@keyframes animScale {
+  0% {
+    opacity: 0;
+    transform: translate3d(0, 40px, 0) scale3d(0.1, 0.6, 1);
+  }
+
+  100% {
+    opacity: 1;
+    transform: translate3d(0, 0, 0) scale3d(1, 1, 1);
+  }
+}
+
+.ns-effect-jelly.ns-show {
+  animation-name: animJelly;
+  animation-duration: 1s;
+  animation-timing-function: linear;
+}
+
+.ns-effect-jelly.ns-hide {
+  animation-name: animFade;
+  animation-duration: 0.3s;
+}
+
+@keyframes animFade {
+  0% {
+    opacity: 0;
+  }
+  100% {
+    opacity: 1;
+  }
+}
+
+@keyframes animJelly {
+  0% {
+    transform: matrix3d(0.7, 0, 0, 0, 0, 0.7, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+  }
+
+  2.083333% {
+    transform: matrix3d(0.75266, 0, 0, 0, 0, 0.76342, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+  }
+
+  4.166667% {
+    transform: matrix3d(0.81071, 0, 0, 0, 0, 0.84545, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+  }
+
+  6.25% {
+    transform: matrix3d(0.86808, 0, 0, 0, 0, 0.9286, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+  }
+
+  8.333333% {
+    transform: matrix3d(0.92038, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+  }
+
+  10.416667% {
+    transform: matrix3d(0.96482, 0, 0, 0, 0, 1.05202, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+  }
+
+  12.5% {
+    transform: matrix3d(1, 0, 0, 0, 0, 1.08204, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+  }
+
+  14.583333% {
+    transform: matrix3d(1.02563, 0, 0, 0, 0, 1.09149, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+  }
+
+  16.666667% {
+    transform: matrix3d(1.04227, 0, 0, 0, 0, 1.08453, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+  }
+
+  18.75% {
+    transform: matrix3d(1.05102, 0, 0, 0, 0, 1.06666, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+  }
+
+  20.833333% {
+    transform: matrix3d(1.05334, 0, 0, 0, 0, 1.04355, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+  }
+
+  22.916667% {
+    transform: matrix3d(1.05078, 0, 0, 0, 0, 1.02012, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+  }
+
+  25% {
+    transform: matrix3d(1.04487, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+  }
+
+  27.083333% {
+    transform: matrix3d(1.03699, 0, 0, 0, 0, 0.98534, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+  }
+
+  29.166667% {
+    transform: matrix3d(1.02831, 0, 0, 0, 0, 0.97688, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+  }
+
+  31.25% {
+    transform: matrix3d(1.01973, 0, 0, 0, 0, 0.97422, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+  }
+
+  33.333333% {
+    transform: matrix3d(1.01191, 0, 0, 0, 0, 0.97618, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+  }
+
+  35.416667% {
+    transform: matrix3d(1.00526, 0, 0, 0, 0, 0.98122, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+  }
+
+  37.5% {
+    transform: matrix3d(1, 0, 0, 0, 0, 0.98773, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+  }
+
+  39.583333% {
+    transform: matrix3d(0.99617, 0, 0, 0, 0, 0.99433, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+  }
+
+  41.666667% {
+    transform: matrix3d(0.99368, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+  }
+
+  43.75% {
+    transform: matrix3d(0.99237, 0, 0, 0, 0, 1.00413, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+  }
+
+  45.833333% {
+    transform: matrix3d(0.99202, 0, 0, 0, 0, 1.00651, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+  }
+
+  47.916667% {
+    transform: matrix3d(0.99241, 0, 0, 0, 0, 1.00726, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+  }
+
+  50% {
+    transform: matrix3d(0.99329, 0, 0, 0, 0, 1.00671, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+  }
+
+  52.083333% {
+    transform: matrix3d(0.99447, 0, 0, 0, 0, 1.00529, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+  }
+
+  54.166667% {
+    transform: matrix3d(0.99577, 0, 0, 0, 0, 1.00346, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+  }
+
+  56.25% {
+    transform: matrix3d(0.99705, 0, 0, 0, 0, 1.0016, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+  }
+
+  58.333333% {
+    transform: matrix3d(0.99822, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+  }
+
+  60.416667% {
+    transform: matrix3d(0.99921, 0, 0, 0, 0, 0.99884, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+  }
+
+  62.5% {
+    transform: matrix3d(1, 0, 0, 0, 0, 0.99816, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+  }
+
+  64.583333% {
+    transform: matrix3d(1.00057, 0, 0, 0, 0, 0.99795, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+  }
+
+  66.666667% {
+    transform: matrix3d(1.00095, 0, 0, 0, 0, 0.99811, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+  }
+
+  68.75% {
+    transform: matrix3d(1.00114, 0, 0, 0, 0, 0.99851, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+  }
+
+  70.833333% {
+    transform: matrix3d(1.00119, 0, 0, 0, 0, 0.99903, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+  }
+
+  72.916667% {
+    transform: matrix3d(1.00114, 0, 0, 0, 0, 0.99955, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+  }
+
+  75% {
+    transform: matrix3d(1.001, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+  }
+
+  77.083333% {
+    transform: matrix3d(1.00083, 0, 0, 0, 0, 1.00033, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+  }
+
+  79.166667% {
+    transform: matrix3d(1.00063, 0, 0, 0, 0, 1.00052, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+  }
+
+  81.25% {
+    transform: matrix3d(1.00044, 0, 0, 0, 0, 1.00058, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+  }
+
+  83.333333% {
+    transform: matrix3d(1.00027, 0, 0, 0, 0, 1.00053, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+  }
+
+  85.416667% {
+    transform: matrix3d(1.00012, 0, 0, 0, 0, 1.00042, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+  }
+
+  87.5% {
+    transform: matrix3d(1, 0, 0, 0, 0, 1.00027, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+  }
+
+  89.583333% {
+    transform: matrix3d(0.99991, 0, 0, 0, 0, 1.00013, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+  }
+
+  91.666667% {
+    transform: matrix3d(0.99986, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+  }
+
+  93.75% {
+    transform: matrix3d(0.99983, 0, 0, 0, 0, 0.99991, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+  }
+
+  95.833333% {
+    transform: matrix3d(0.99982, 0, 0, 0, 0, 0.99985, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+  }
+
+  97.916667% {
+    transform: matrix3d(0.99983, 0, 0, 0, 0, 0.99984, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+  }
+
+  100% {
+    transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+  }
+}
+
+.ns-effect-slide-left.ns-show {
+  animation-name: animSlideElasticLeft;
+  animation-duration: 1s;
+  animation-timing-function: linear;
+}
+
+@keyframes animSlideElasticLeft {
+  0% {
+    transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, -1000, 0, 0, 1);
+  }
+
+  1.666667% {
+    transform: matrix3d(1.92933, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, -739.26805, 0, 0, 1);
+  }
+
+  3.333333% {
+    transform: matrix3d(1.96989, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, -521.82545, 0, 0, 1);
+  }
+
+  5% {
+    transform: matrix3d(1.70901, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, -349.26115, 0, 0, 1);
+  }
+
+  6.666667% {
+    transform: matrix3d(1.4235, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, -218.3238, 0, 0, 1);
+  }
+
+  8.333333% {
+    transform: matrix3d(1.21065, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, -123.29848, 0, 0, 1);
+  }
+
+  10% {
+    transform: matrix3d(1.08167, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, -57.59273, 0, 0, 1);
+  }
+
+  11.666667% {
+    transform: matrix3d(1.0165, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, -14.72371, 0, 0, 1);
+  }
+
+  13.333333% {
+    transform: matrix3d(0.99057, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 11.12794, 0, 0, 1);
+  }
+
+  15% {
+    transform: matrix3d(0.98478, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 24.86339, 0, 0, 1);
+  }
+
+  16.666667% {
+    transform: matrix3d(0.98719, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 30.40503, 0, 0, 1);
+  }
+
+  18.333333% {
+    transform: matrix3d(0.9916, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 30.75275, 0, 0, 1);
+  }
+
+  20% {
+    transform: matrix3d(0.99541, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 28.10141, 0, 0, 1);
+  }
+
+  21.666667% {
+    transform: matrix3d(0.99795, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 23.98271, 0, 0, 1);
+  }
+
+  23.333333% {
+    transform: matrix3d(0.99936, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 19.40752, 0, 0, 1);
+  }
+
+  25% {
+    transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 14.99558, 0, 0, 1);
+  }
+
+  26.666667% {
+    transform: matrix3d(1.00021, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 11.08575, 0, 0, 1);
+  }
+
+  28.333333% {
+    transform: matrix3d(1.00022, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 7.82507, 0, 0, 1);
+  }
+
+  30% {
+    transform: matrix3d(1.00016, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 5.23737, 0, 0, 1);
+  }
+
+  31.666667% {
+    transform: matrix3d(1.0001, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 3.27389, 0, 0, 1);
+  }
+
+  33.333333% {
+    transform: matrix3d(1.00005, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 1.84893, 0, 0, 1);
+  }
+
+  35% {
+    transform: matrix3d(1.00002, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0.86364, 0, 0, 1);
+  }
+
+  36.666667% {
+    transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0.22079, 0, 0, 1);
+  }
+
+  38.333333% {
+    transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, -0.16687, 0, 0, 1);
+  }
+
+  40% {
+    transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, -0.37284, 0, 0, 1);
+  }
+
+  41.666667% {
+    transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, -0.45594, 0, 0, 1);
+  }
+
+  43.333333% {
+    transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, -0.46116, 0, 0, 1);
+  }
+
+  45% {
+    transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, -0.4214, 0, 0, 1);
+  }
+
+  46.666667% {
+    transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, -0.35963, 0, 0, 1);
+  }
+
+  48.333333% {
+    transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, -0.29103, 0, 0, 1);
+  }
+
+  50% {
+    transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, -0.22487, 0, 0, 1);
+  }
+
+  51.666667% {
+    transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, -0.16624, 0, 0, 1);
+  }
+
+  53.333333% {
+    transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, -0.11734, 0, 0, 1);
+  }
+
+  55% {
+    transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, -0.07854, 0, 0, 1);
+  }
+
+  56.666667% {
+    transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, -0.04909, 0, 0, 1);
+  }
+
+  58.333333% {
+    transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, -0.02773, 0, 0, 1);
+  }
+
+  60% {
+    transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, -0.01295, 0, 0, 1);
+  }
+
+  61.666667% {
+    transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, -0.00331, 0, 0, 1);
+  }
+
+  63.333333% {
+    transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0.0025, 0, 0, 1);
+  }
+
+  65% {
+    transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0.00559, 0, 0, 1);
+  }
+
+  66.666667% {
+    transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0.00684, 0, 0, 1);
+  }
+
+  68.333333% {
+    transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0.00692, 0, 0, 1);
+  }
+
+  70% {
+    transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0.00632, 0, 0, 1);
+  }
+
+  71.666667% {
+    transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0.00539, 0, 0, 1);
+  }
+
+  73.333333% {
+    transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0.00436, 0, 0, 1);
+  }
+
+  75% {
+    transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0.00337, 0, 0, 1);
+  }
+
+  76.666667% {
+    transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0.00249, 0, 0, 1);
+  }
+
+  78.333333% {
+    transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0.00176, 0, 0, 1);
+  }
+
+  80% {
+    transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0.00118, 0, 0, 1);
+  }
+
+  81.666667% {
+    transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0.00074, 0, 0, 1);
+  }
+
+  83.333333% {
+    transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0.00042, 0, 0, 1);
+  }
+
+  85% {
+    transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0.00019, 0, 0, 1);
+  }
+
+  86.666667% {
+    transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0.00005, 0, 0, 1);
+  }
+
+  88.333333% {
+    transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, -0.00004, 0, 0, 1);
+  }
+
+  90% {
+    transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, -0.00008, 0, 0, 1);
+  }
+
+  91.666667% {
+    transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, -0.0001, 0, 0, 1);
+  }
+
+  93.333333% {
+    transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, -0.0001, 0, 0, 1);
+  }
+
+  95% {
+    transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, -0.00009, 0, 0, 1);
+  }
+
+  96.666667% {
+    transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, -0.00008, 0, 0, 1);
+  }
+
+  98.333333% {
+    transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, -0.00007, 0, 0, 1);
+  }
+
+  100% {
+    transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+  }
+}
+
+.ns-effect-slide-left.ns-hide {
+  animation-name: animSlideLeft;
+  animation-duration: 0.25s;
+}
+
+@keyframes animSlideLeft {
+  0% {
+    transform: translate3d(-30px, 0, 0) translate3d(-100%, 0, 0);
+  }
+
+  100% {
+    transform: translate3d(0, 0, 0);
+  }
+}
+
+.ns-effect-slide-right.ns-show {
+  animation: animSlideElasticRight 2000ms linear both;
+}
+
+@keyframes animSlideElasticRight {
+  0% {
+    transform: matrix3d(2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1000, 0, 0, 1);
+  }
+
+  2.15% {
+    transform: matrix3d(1.486, 0, 0, 0, 0, 0.514, 0, 0, 0, 0, 1, 0, 664.594, 0, 0, 1);
+  }
+
+  4.1% {
+    transform: matrix3d(1.147, 0, 0, 0, 0, 0.853, 0, 0, 0, 0, 1, 0, 419.708, 0, 0, 1);
+  }
+
+  4.3% {
+    transform: matrix3d(1.121, 0, 0, 0, 0, 0.879, 0, 0, 0, 0, 1, 0, 398.136, 0, 0, 1);
+  }
+
+  6.46% {
+    transform: matrix3d(0.948, 0, 0, 0, 0, 1.052, 0, 0, 0, 0, 1, 0, 206.714, 0, 0, 1);
+  }
+
+  8.11% {
+    transform: matrix3d(0.908, 0, 0, 0, 0, 1.092, 0, 0, 0, 0, 1, 0, 105.491, 0, 0, 1);
+  }
+
+  8.61% {
+    transform: matrix3d(0.907, 0, 0, 0, 0, 1.093, 0, 0, 0, 0, 1, 0, 81.572, 0, 0, 1);
+  }
+
+  12.11% {
+    transform: matrix3d(0.95, 0, 0, 0, 0, 1.05, 0, 0, 0, 0, 1, 0, -18.434, 0, 0, 1);
+  }
+
+  14.16% {
+    transform: matrix3d(0.979, 0, 0, 0, 0, 1.021, 0, 0, 0, 0, 1, 0, -38.734, 0, 0, 1);
+  }
+
+  16.12% {
+    transform: matrix3d(0.997, 0, 0, 0, 0, 1.003, 0, 0, 0, 0, 1, 0, -43.356, 0, 0, 1);
+  }
+
+  19.72% {
+    transform: matrix3d(1.006, 0, 0, 0, 0, 0.994, 0, 0, 0, 0, 1, 0, -34.155, 0, 0, 1);
+  }
+
+  27.23% {
+    transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, -7.839, 0, 0, 1);
+  }
+
+  30.83% {
+    transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, -1.951, 0, 0, 1);
+  }
+
+  38.34% {
+    transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 1.037, 0, 0, 1);
+  }
+
+  41.99% {
+    transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0.812, 0, 0, 1);
+  }
+
+  50% {
+    transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0.159, 0, 0, 1);
+  }
+
+  60.56% {
+    transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, -0.025, 0, 0, 1);
+  }
+
+  82.78% {
+    transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0.001, 0, 0, 1);
+  }
+
+  100% {
+    transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+  }
+}
+
+.ns-effect-slide-right.ns-hide {
+  animation-name: animSlideRight;
+  animation-duration: 0.25s;
+}
+
+@keyframes animSlideRight {
+  0% {
+    transform: translate3d(30px, 0, 0) translate3d(100%, 0, 0);
+  }
+
+  100% {
+    transform: translate3d(0, 0, 0);
+  }
+}
+
+.ns-effect-slide-center.ns-show {
+  animation: animSlideElasticCenter 2000ms linear both;
+}
+
+@keyframes animSlideElasticCenter {
+  0% {
+    transform: matrix3d(1, 0, 0, 0, 0, 3, 0, 0, 0, 0, 1, 0, 0, -300, 0, 1);
+  }
+
+  2.15% {
+    transform: matrix3d(1, 0, 0, 0, 0, 1.971, 0, 0, 0, 0, 1, 0, 0, -199.378, 0, 1);
+  }
+
+  4.1% {
+    transform: matrix3d(1, 0, 0, 0, 0, 1.294, 0, 0, 0, 0, 1, 0, 0, -125.912, 0, 1);
+  }
+
+  4.3% {
+    transform: matrix3d(1, 0, 0, 0, 0, 1.243, 0, 0, 0, 0, 1, 0, 0, -119.441, 0, 1);
+  }
+
+  6.46% {
+    transform: matrix3d(1, 0, 0, 0, 0, 0.895, 0, 0, 0, 0, 1, 0, 0, -62.014, 0, 1);
+  }
+
+  8.11% {
+    transform: matrix3d(1, 0, 0, 0, 0, 0.817, 0, 0, 0, 0, 1, 0, 0, -31.647, 0, 1);
+  }
+
+  8.61% {
+    transform: matrix3d(1, 0, 0, 0, 0, 0.813, 0, 0, 0, 0, 1, 0, 0, -24.472, 0, 1);
+  }
+
+  12.11% {
+    transform: matrix3d(1, 0, 0, 0, 0, 0.9, 0, 0, 0, 0, 1, 0, 0, 5.53, 0, 1);
+  }
+
+  14.16% {
+    transform: matrix3d(1, 0, 0, 0, 0, 0.959, 0, 0, 0, 0, 1, 0, 0, 11.62, 0, 1);
+  }
+
+  16.12% {
+    transform: matrix3d(1, 0, 0, 0, 0, 0.994, 0, 0, 0, 0, 1, 0, 0, 13.007, 0, 1);
+  }
+
+  19.72% {
+    transform: matrix3d(1, 0, 0, 0, 0, 1.012, 0, 0, 0, 0, 1, 0, 0, 10.247, 0, 1);
+  }
+
+  27.23% {
+    transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 2.352, 0, 1);
+  }
+
+  30.83% {
+    transform: matrix3d(1, 0, 0, 0, 0, 0.999, 0, 0, 0, 0, 1, 0, 0, 0.585, 0, 1);
+  }
+
+  38.34% {
+    transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, -0.311, 0, 1);
+  }
+
+  41.99% {
+    transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, -0.244, 0, 1);
+  }
+
+  50% {
+    transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, -0.048, 0, 1);
+  }
+
+  60.56% {
+    transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0.007, 0, 1);
+  }
+
+  82.78% {
+    transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+  }
+
+  100% {
+    transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
+  }
+}
+
+.ns-effect-slide-center.ns-hide {
+  animation-name: animSlideCenter;
+  animation-duration: 0.25s;
+}
+
+@keyframes animSlideCenter {
+  0% {
+    transform: translate3d(0, -30px, 0) translate3d(0, -100%, 0);
+  }
+
+  100% {
+    transform: translate3d(0, 0, 0);
+  }
+}
+
+.ns-effect-genie.ns-show,
+.ns-effect-genie.ns-hide {
+  animation-name: animGenie;
+  animation-duration: 0.4s;
+}
+
+@keyframes animGenie {
+  0% {
+    opacity: 0;
+    transform: translate3d(0, calc(200% + 30px), 0) scale3d(0, 1, 1);
+    animation-timing-function: ease-in;
+  }
+
+  40% {
+    opacity: 0.5;
+    transform: translate3d(0, 0, 0) scale3d(0.02, 1.1, 1);
+    animation-timing-function: ease-out;
+  }
+
+  70% {
+    opacity: 0.6;
+    transform: translate3d(0, -40px, 0) scale3d(0.8, 1.1, 1);
+  }
+
+  100% {
+    opacity: 1;
+    transform: translate3d(0, 0, 0) scale3d(1, 1, 1);
+  }
+}

modules/default/alert/notificationFx.js

@@ -1,34 +1,21 @@
 /**
+ * Based on work by
+ *
  * notificationFx.js v1.0.0
- * http://www.codrops.com
+ * https://tympanus.net/codrops/
  *
  * Licensed under the MIT license.
- * http://www.opensource.org/licenses/mit-license.php
+ * https://opensource.org/licenses/mit-license.php
  *
  * Copyright 2014, Codrops
- * http://www.codrops.com
+ * https://tympanus.net/codrops/
  */
-// jscs:disable
-;(function(window) {
-
-	"use strict";
-
-	var docElem = window.document.documentElement,
-		support = {animations: Modernizr.cssanimations},
-		animEndEventNames = {
-			"WebkitAnimation": "webkitAnimationEnd",
-			"OAnimation": "oAnimationEnd",
-			"msAnimation": "MSAnimationEnd",
-			"animation": "animationend"
-		},
-		// animation end event name
-		animEndEventName = animEndEventNames[ Modernizr.prefixed("animation") ];
-
+(function (window) {
 	/**
 	 * extend obj function
 	 */
 	function extend(a, b) {
-		for (var key in b) {
+		for (let key in b) {
 			if (b.hasOwnProperty(key)) {
 				a[key] = b[key];
 			}
@@ -70,19 +57,23 @@
 		ttl: 6000,
 		al_no: "ns-box",
 		// callbacks
-		onClose: function() { return false; },
-		onOpen: function() { return false; }
+		onClose: function () {
+			return false;
+		},
+		onOpen: function () {
+			return false;
+		}
 	};
 
 	/**
 	 * init function
 	 * initialize and cache some vars
 	 */
-	NotificationFx.prototype._init = function() {
+	NotificationFx.prototype._init = function () {
 		// create HTML structure
 		this.ntf = document.createElement("div");
-		this.ntf.className = this.options.al_no +  " ns-" + this.options.layout + " ns-effect-" + this.options.effect + " ns-type-" + this.options.type;
-		var strinner = "<div class=\"ns-box-inner\">";
+		this.ntf.className = this.options.al_no + " ns-" + this.options.layout + " ns-effect-" + this.options.effect + " ns-type-" + this.options.type;
+		let strinner = '<div class="ns-box-inner">';
 		strinner += this.options.message;
 		strinner += "</div>";
 		this.ntf.innerHTML = strinner;
@@ -91,13 +82,12 @@
 		this.options.wrapper.insertBefore(this.ntf, this.options.wrapper.nextSibling);
 
 		// dismiss after [options.ttl]ms
-		var self = this;
 		if (this.options.ttl) {
-			this.dismissttl = setTimeout(function() {
-			if (self.active) {
-				self.dismiss();
-			}
-		}, this.options.ttl);
+			this.dismissttl = setTimeout(() => {
+				if (this.active) {
+					this.dismiss();
+				}
+			}, this.options.ttl);
 		}
 
 		// init events
@@ -107,59 +97,54 @@
 	/**
 	 * init events
 	 */
-	NotificationFx.prototype._initEvents = function() {
-		var self = this;
+	NotificationFx.prototype._initEvents = function () {
 		// dismiss notification by tapping on it if someone has a touchscreen
-		this.ntf.querySelector(".ns-box-inner").addEventListener("click", function() { self.dismiss(); });
+		this.ntf.querySelector(".ns-box-inner").addEventListener("click", () => {
+			this.dismiss();
+		});
 	};
 
 	/**
 	 * show the notification
 	 */
-	NotificationFx.prototype.show = function() {
+	NotificationFx.prototype.show = function () {
 		this.active = true;
-		classie.remove(this.ntf, "ns-hide");
-		classie.add(this.ntf, "ns-show");
+		this.ntf.classList.remove("ns-hide");
+		this.ntf.classList.add("ns-show");
 		this.options.onOpen();
 	};
 
 	/**
 	 * dismiss the notification
 	 */
-	NotificationFx.prototype.dismiss = function() {
-		var self = this;
+	NotificationFx.prototype.dismiss = function () {
 		this.active = false;
 		clearTimeout(this.dismissttl);
-		classie.remove(this.ntf, "ns-show");
-		setTimeout(function() {
-			classie.add(self.ntf, "ns-hide");
+		this.ntf.classList.remove("ns-show");
+		setTimeout(() => {
+			this.ntf.classList.add("ns-hide");
 
 			// callback
-			self.options.onClose();
+			this.options.onClose();
 		}, 25);
 
 		// after animation ends remove ntf from the DOM
-		var onEndAnimationFn = function(ev) {
-			if (support.animations) {
-				if (ev.target !== self.ntf) return false;
-				this.removeEventListener(animEndEventName, onEndAnimationFn);
+		const onEndAnimationFn = (ev) => {
+			if (ev.target !== this.ntf) {
+				return false;
 			}
+			this.ntf.removeEventListener("animationend", onEndAnimationFn);
 
-			if (this.parentNode === self.options.wrapper) {
-				self.options.wrapper.removeChild(this);
+			if (ev.target.parentNode === this.options.wrapper) {
+				this.options.wrapper.removeChild(this.ntf);
 			}
 		};
 
-		if (support.animations) {
-			this.ntf.addEventListener(animEndEventName, onEndAnimationFn);
-		} else {
-			onEndAnimationFn();
-		}
+		this.ntf.addEventListener("animationend", onEndAnimationFn);
 	};
 
 	/**
 	 * add to global namespace
 	 */
 	window.NotificationFx = NotificationFx;
-
 })(window);

modules/default/alert/translations/bg.json

@@ -1,4 +1,4 @@
 {
-  "sysTitle": "MagicMirror нотификация",
-  "welcome": "Добре дошли, стартирането беше успешно"
+	"sysTitle": "MagicMirror нотификация",
+	"welcome": "Добре дошли, стартирането беше успешно"
 }

modules/default/alert/translations/da.json

@@ -1,4 +1,4 @@
 {
-  "sysTitle": "MagicMirror Notifikation",
-  "welcome": "Velkommen, modulet er succesfuldt startet!"
+	"sysTitle": "MagicMirror Notifikation",
+	"welcome": "Velkommen, modulet er succesfuldt startet!"
 }

modules/default/alert/translations/de.json

@@ -1,4 +1,4 @@
 {
-  "sysTitle": "MagicMirror Benachrichtigung",
-  "welcome": "Willkommen, Start war erfolgreich!"
+	"sysTitle": "MagicMirror Benachrichtigung",
+	"welcome": "Willkommen, Start war erfolgreich!"
 }

modules/default/alert/translations/en.json

@@ -1,4 +1,4 @@
 {
-  "sysTitle": "MagicMirror Notification",
-  "welcome": "Welcome, start was successful!"
+	"sysTitle": "MagicMirror Notification",
+	"welcome": "Welcome, start was successful!"
 }

modules/default/alert/translations/es.json

@@ -1,4 +1,4 @@
 {
-  "sysTitle": "MagicMirror Notificaciones",
-  "welcome": "Bienvenido, ¡se iniciado correctamente!"
+	"sysTitle": "MagicMirror Notificaciones",
+	"welcome": "Bienvenido, ¡se iniciado correctamente!"
 }

modules/default/alert/translations/fr.json

@@ -0,0 +1,4 @@
+{
+	"sysTitle": "MagicMirror Notification",
+	"welcome": "Bienvenue, le démarrage a été un succès!"
+}

modules/default/alert/translations/hu.json

@@ -1,4 +1,4 @@
 {
-  "sysTitle": "MagicMirror értesítés",
-  "welcome": "Üdvözöljük, indulás sikeres!"
+	"sysTitle": "MagicMirror értesítés",
+	"welcome": "Üdvözöljük, indulás sikeres!"
 }

modules/default/alert/translations/nl.json

@@ -1,4 +1,4 @@
 {
-  "sysTitle": "MagicMirror Notificatie",
-  "welcome": "Welkom, Succesvol gestart!"
+	"sysTitle": "MagicMirror Notificatie",
+	"welcome": "Welkom, Succesvol gestart!"
 }

modules/default/alert/translations/ru.json

@@ -1,4 +1,4 @@
 {
-  "sysTitle": "MagicMirror Уведомление",
-  "welcome": "Добро пожаловать, старт был успешным!"
+	"sysTitle": "MagicMirror Уведомление",
+	"welcome": "Добро пожаловать, старт был успешным!"
 }

modules/default/calendar/README.md

@@ -1,91 +1,6 @@
 # Module: Calendar
+
 The `calendar` module is one of the default modules of the MagicMirror.
 This module displays events from a public .ical calendar. It can combine multiple calendars.
 
-## Using the module
-
-To use this module, add it to the modules array in the `config/config.js` file:
-````javascript
-modules: [
-	{
-		module: "calendar",
-		position: "top_left",	// This can be any of the regions. Best results in left or right regions.
-		config: {
-			// The config property is optional.
-			// If no config is set, an example calendar is shown.
-			// See 'Configuration options' for more information.
-		}
-	}
-]
-````
-
-## Configuration options
-
-The following properties can be configured:
-
-
-| Option                       | Description
-| ---------------------------- | -----------
-| `maximumEntries`             | The maximum number of events shown. / **Possible values:** `0` - `100` <br> **Default value:** `10`
-| `maximumNumberOfDays`        | The maximum number of days in the future. <br><br> **Default value:** `365`
-| `displaySymbol`              | Display a symbol in front of an entry. <br><br> **Possible values:** `true` or `false` <br> **Default value:** `true`
-| `defaultSymbol`              | The default symbol. <br><br> **Possible values:** See [Font Awsome](http://fontawesome.io/icons/) website. <br> **Default value:** `calendar`
-| `maxTitleLength`             | The maximum title length. <br><br> **Possible values:** `10` - `50` <br> **Default value:** `25`
-| `wrapEvents`                 | Wrap event titles to multiple lines. Breaks lines at the length defined by `maxTitleLength`. <br><br> **Possible values:** `true` or `false` <br> **Default value:** `false`
-| `fetchInterval`              | How often does the content needs to be fetched? (Milliseconds) <br><br> **Possible values:** `1000` - `86400000` <br> **Default value:** `300000` (5 minutes)
-| `animationSpeed`             | Speed of the update animation. (Milliseconds) <br><br> **Possible values:**`0` - `5000` <br> **Default value:** `2000` (2 seconds)
-| `fade`                       | Fade the future events to black. (Gradient) <br><br> **Possible values:** `true` or `false` <br> **Default value:** `true`
-| `fadePoint`                  | Where to start fade? <br><br> **Possible values:** `0` (top of the list) - `1` (bottom of list) <br> **Default value:** `0.25`
-| `calendars`                  | The list of calendars. <br><br> **Possible values:** An array, see _calendar configuration_ below. <br> **Default value:** _An example calendar._
-| `titleReplace`               | An object of textual replacements applied to the tile of the event. This allow to remove or replace certains words in the title. <br><br> **Example:** `{'Birthday of ' : '', 'foo':'bar'}` <br> **Default value:** `{	"De verjaardag van ": "", "'s birthday": ""	}`
-| `displayRepeatingCountTitle` | Show count title for yearly repeating events (e.g. "X. Birthday", "X. Anniversary") <br><br> **Possible values:** `true` or `false` <br> **Default value:** `false`
-| `dateFormat`                 | Format to use for the date of events (when using absolute dates) <br><br> **Possible values:** See [Moment.js formats](http://momentjs.com/docs/#/parsing/string-format/) <br> **Default value:** `MMM Do` (e.g. Jan 18th)
-| `fullDayEventDateFormat`     | Format to use for the date of full day events (when using absolute dates) <br><br> **Possible values:** See [Moment.js formats](http://momentjs.com/docs/#/parsing/string-format/) <br> **Default value:** `MMM Do` (e.g. Jan 18th)
-| `timeFormat`                 | Display event times as absolute dates, or relative time <br><br> **Possible values:** `absolute` or `relative` <br> **Default value:** `relative`
-| `getRelative`                | How much time (in hours) should be left until calendar events start getting relative? <br><br> **Possible values:** `0` (events stay absolute) - `48` (48 hours before the event starts) <br> **Default value:** `6`
-| `urgency`                    | When using a timeFormat of `absolute`, the `urgency` setting allows you to display events within a specific time frame as `relative`. This allows events within a certain time frame to be displayed as relative (in xx days) while others are displayed as absolute dates <br><br> **Possible values:** a positive integer representing the number of days for which you want a relative date, for example `7` (for 7 days) <br><br> **Default value:** `7`
-| `broadcastEvents`            | If this property is set to true, the calendar will broadcast all the events to all other modules with the notification message: `CALENDAR_EVENTS`. The event objects are stored in an array and contain the following fields: `title`, `startDate`, `endDate`, `fullDayEvent`, `location` and `geo`. <br><br> **Possible values:** `true`, `false` <br><br> **Default value:** `true`
-| `hidePrivate`                | Hides private calendar events. <br><br> **Possible values:** `true` or `false` <br> **Default value:** `false`
-| `excludedEvents`             | An array of words / phrases from event titles that will be excluded from being shown. <br><br> **Example:** `['Birthday', 'Hide This Event']` <br> **Default value:** `[]`
-
-### Calendar configuration
-
-The `calendars` property contains an array of the configured calendars.
-The `colored` property gives the option for an individual color for each calendar.
-
-#### Default value:
-````javascript
-config: {
-	colored: false,
-	calendars: [
-		{
-			url: 'http://www.calendarlabs.com/templates/ical/US-Holidays.ics',
-			symbol: 'calendar',
-			auth: {
-			    user: 'username',
-			    pass: 'superstrongpassword',
-			    method: 'basic'
-			}
-		},
-	],
-}
-````
-
-#### Calendar configuration options:
-| Option                | Description
-| --------------------- | -----------
-| `url`	                | The url of the calendar .ical. This property is required. <br><br> **Possible values:** Any public accessble .ical calendar.
-| `symbol`              | The symbol to show in front of an event. This property is optional. <br><br> **Possible values:** See [Font Awesome](http://fontawesome.io/icons/) website. To have multiple symbols you can define them in an array e.g. `["calendar", "plane"]`
-| `color`              | The font color of an event from this calendar. This property should be set if the config is set to colored: true. <br><br> **Possible values:** HEX, RGB or RGBA values (#efefef, rgb(242,242,242), rgba(242,242,242,0.5)).
-| `repeatingCountTitle`	| The count title for yearly repating events in this calendar.  <br><br> **Example:** `'Birthday'`
-| `maximumEntries`      | The maximum number of events shown.  Overrides global setting. **Possible values:** `0` - `100`
-| `maximumNumberOfDays` | The maximum number of days in the future.  Overrides global setting
-| `auth`                | The object containing options for authentication against the calendar.
-
-
-#### Calendar authentication options:
-| Option                | Description
-| --------------------- | -----------
-| `user`                | The username for HTTP authentication.
-| `pass`                | The password for HTTP authentication. (If you use Bearer authentication, this should be your BearerToken.)
-| `method`              | Which authentication method should be used. HTTP Basic, Digest and Bearer authentication methods are supported. Basic authentication is used by default if this option is omitted. **Possible values:** `digest`, `basic`, `bearer` **Default value:** `basic`
+For configuration options, please check the [MagicMirror² documentation](https://docs.magicmirror.builders/modules/calendar.html).

modules/default/calendar/calendar.css

@@ -7,8 +7,6 @@
 
 .calendar .symbol span {
   display: inline-block;
-  -ms-transform: translate(0, 2px); /* IE 9 */
-  -webkit-transform: translate(0, 2px); /* Safari */
   transform: translate(0, 2px);
 }
 

modules/default/calendar/calendar.js

@@ -1,47 +1,61 @@
-/* global Module */
+/* global cloneObject */
 
 /* Magic Mirror
  * Module: Calendar
  *
- * By Michael Teeuw http://michaelteeuw.nl
+ * By Michael Teeuw https://michaelteeuw.nl
  * MIT Licensed.
  */
-
 Module.register("calendar", {
-
 	// Define module defaults
 	defaults: {
 		maximumEntries: 10, // Total Maximum Entries
 		maximumNumberOfDays: 365,
 		displaySymbol: true,
-		defaultSymbol: "calendar", // Fontawesome Symbol see http://fontawesome.io/cheatsheet/
+		defaultSymbol: "calendar", // Fontawesome Symbol see https://fontawesome.com/cheatsheet?from=io
+		showLocation: false,
 		displayRepeatingCountTitle: false,
 		defaultRepeatingCountTitle: "",
 		maxTitleLength: 25,
+		maxLocationTitleLength: 25,
 		wrapEvents: false, // wrap events to multiple lines breaking at maxTitleLength
+		wrapLocationEvents: false,
+		maxTitleLines: 3,
+		maxEventTitleLines: 3,
 		fetchInterval: 5 * 60 * 1000, // Update every 5 minutes.
 		animationSpeed: 2000,
 		fade: true,
 		urgency: 7,
 		timeFormat: "relative",
 		dateFormat: "MMM Do",
+		dateEndFormat: "LT",
 		fullDayEventDateFormat: "MMM Do",
+		showEnd: false,
 		getRelative: 6,
 		fadePoint: 0.25, // Start on 1/4th of the list.
 		hidePrivate: false,
+		hideOngoing: false,
 		colored: false,
+		coloredSymbolOnly: false,
+		tableClass: "small",
 		calendars: [
 			{
 				symbol: "calendar",
-				url: "http://www.calendarlabs.com/templates/ical/US-Holidays.ics",
-			},
+				url: "https://www.calendarlabs.com/templates/ical/US-Holidays.ics"
+			}
 		],
 		titleReplace: {
 			"De verjaardag van ": "",
 			"'s birthday": ""
 		},
+		locationTitleReplace: {
+			"street ": ""
+		},
 		broadcastEvents: true,
-		excludedEvents: []
+		excludedEvents: [],
+		sliceMultiDayEvents: false,
+		broadcastPastEvents: false,
+		nextDaysRelative: false
 	},
 
 	// Define required scripts.
@@ -75,20 +89,37 @@ Module.register("calendar", {
 
 			var calendarConfig = {
 				maximumEntries: calendar.maximumEntries,
-				maximumNumberOfDays: calendar.maximumNumberOfDays
+				maximumNumberOfDays: calendar.maximumNumberOfDays,
+				broadcastPastEvents: calendar.broadcastPastEvents
 			};
+			if (calendar.symbolClass === "undefined" || calendar.symbolClass === null) {
+				calendarConfig.symbolClass = "";
+			}
+			if (calendar.titleClass === "undefined" || calendar.titleClass === null) {
+				calendarConfig.titleClass = "";
+			}
+			if (calendar.timeClass === "undefined" || calendar.timeClass === null) {
+				calendarConfig.timeClass = "";
+			}
 
 			// we check user and password here for backwards compatibility with old configs
-			if(calendar.user && calendar.pass) {
+			if (calendar.user && calendar.pass) {
 				Log.warn("Deprecation warning: Please update your calendar authentication configuration.");
 				Log.warn("https://github.com/MichMich/MagicMirror/tree/v2.1.2/modules/default/calendar#calendar-authentication-options");
 				calendar.auth = {
 					user: calendar.user,
 					pass: calendar.pass
-				}
+				};
 			}
 
 			this.addCalendar(calendar.url, calendar.auth, calendarConfig);
+
+			// Trigger ADD_CALENDAR every fetchInterval to make sure there is always a calendar
+			// fetcher running on the server side.
+			var self = this;
+			setInterval(function () {
+				self.addCalendar(calendar.url, calendar.auth, calendarConfig);
+			}, self.config.fetchInterval);
 		}
 
 		this.calendarData = {};
@@ -97,6 +128,10 @@ Module.register("calendar", {
 
 	// Override socket notification handler.
 	socketNotificationReceived: function (notification, payload) {
+		if (this.identifier !== payload.id) {
+			return;
+		}
+
 		if (notification === "CALENDAR_EVENTS") {
 			if (this.hasCalendarURL(payload.url)) {
 				this.calendarData[payload.url] = payload.events;
@@ -108,10 +143,9 @@ Module.register("calendar", {
 			}
 		} else if (notification === "FETCH_ERROR") {
 			Log.error("Calendar Error. Could not fetch calendar: " + payload.url);
+			this.loaded = true;
 		} else if (notification === "INCORRECT_URL") {
 			Log.error("Calendar Error. Incorrect url: " + payload.url);
-		} else {
-			Log.log("Calendar received an unknown socket notification: " + notification);
 		}
 
 		this.updateDom(this.config.animationSpeed);
@@ -119,22 +153,55 @@ Module.register("calendar", {
 
 	// Override dom generator.
 	getDom: function () {
-
 		var events = this.createEventList();
 		var wrapper = document.createElement("table");
-		wrapper.className = "small";
+		wrapper.className = this.config.tableClass;
 
 		if (events.length === 0) {
-			wrapper.innerHTML = (this.loaded) ? this.translate("EMPTY") : this.translate("LOADING");
-			wrapper.className = "small dimmed";
+			wrapper.innerHTML = this.loaded ? this.translate("EMPTY") : this.translate("LOADING");
+			wrapper.className = this.config.tableClass + " dimmed";
 			return wrapper;
 		}
 
+		if (this.config.fade && this.config.fadePoint < 1) {
+			if (this.config.fadePoint < 0) {
+				this.config.fadePoint = 0;
+			}
+			var startFade = events.length * this.config.fadePoint;
+			var fadeSteps = events.length - startFade;
+		}
+
+		var currentFadeStep = 0;
+		var lastSeenDate = "";
+
 		for (var e in events) {
 			var event = events[e];
+			var dateAsString = moment(event.startDate, "x").format(this.config.dateFormat);
+			if (this.config.timeFormat === "dateheaders") {
+				if (lastSeenDate !== dateAsString) {
+					var dateRow = document.createElement("tr");
+					dateRow.className = "normal";
+					var dateCell = document.createElement("td");
+
+					dateCell.colSpan = "3";
+					dateCell.innerHTML = dateAsString;
+					dateCell.style.paddingTop = "10px";
+					dateRow.appendChild(dateCell);
+					wrapper.appendChild(dateRow);
+
+					if (e >= startFade) {
+						//fading
+						currentFadeStep = e - startFade;
+						dateRow.style.opacity = 1 - (1 / fadeSteps) * currentFadeStep;
+					}
+
+					lastSeenDate = dateAsString;
+				}
+			}
+
 			var eventWrapper = document.createElement("tr");
 
-			if (this.config.colored) {
+			if (this.config.colored && !this.config.coloredSymbolOnly) {
 				eventWrapper.style.cssText = "color:" + this.colorForUrl(event.url);
 			}
 
@@ -142,28 +209,38 @@ Module.register("calendar", {
 
 			if (this.config.displaySymbol) {
 				var symbolWrapper = document.createElement("td");
-				symbolWrapper.className = "symbol align-right";
+
+				if (this.config.colored && this.config.coloredSymbolOnly) {
+					symbolWrapper.style.cssText = "color:" + this.colorForUrl(event.url);
+				}
+
+				var symbolClass = this.symbolClassForUrl(event.url);
+				symbolWrapper.className = "symbol align-right " + symbolClass;
+
 				var symbols = this.symbolsForUrl(event.url);
-				if(typeof symbols === "string") {
+				if (typeof symbols === "string") {
 					symbols = [symbols];
 				}
 
-				for(var i = 0; i < symbols.length; i++) {
+				for (var i = 0; i < symbols.length; i++) {
 					var symbol = document.createElement("span");
 					symbol.className = "fa fa-fw fa-" + symbols[i];
-					if(i > 0){
+					if (i > 0) {
 						symbol.style.paddingLeft = "5px";
 					}
 					symbolWrapper.appendChild(symbol);
 				}
 				eventWrapper.appendChild(symbolWrapper);
+			} else if (this.config.timeFormat === "dateheaders") {
+				var blankCell = document.createElement("td");
+				blankCell.innerHTML = "&nbsp;&nbsp;&nbsp;";
+				eventWrapper.appendChild(blankCell);
 			}
 
 			var titleWrapper = document.createElement("td"),
 				repeatingCountTitle = "";
 
-			if (this.config.displayRepeatingCountTitle) {
-
+			if (this.config.displayRepeatingCountTitle && event.firstYear !== undefined) {
 				repeatingCountTitle = this.countTitleForUrl(event.url);
 
 				if (repeatingCountTitle !== "") {
@@ -174,64 +251,55 @@ Module.register("calendar", {
 				}
 			}
 
-			titleWrapper.innerHTML = this.titleTransform(event.title) + repeatingCountTitle;
+			titleWrapper.innerHTML = this.titleTransform(event.title, this.config.titleReplace, this.config.wrapEvents, this.config.maxTitleLength, this.config.maxTitleLines) + repeatingCountTitle;
+
+			var titleClass = this.titleClassForUrl(event.url);
 
 			if (!this.config.colored) {
-				titleWrapper.className = "title bright";
+				titleWrapper.className = "title bright " + titleClass;
 			} else {
-				titleWrapper.className = "title";
+				titleWrapper.className = "title " + titleClass;
 			}
 
-			eventWrapper.appendChild(titleWrapper);
+			var timeWrapper;
 
-			var timeWrapper = document.createElement("td");
-			//console.log(event.today);
-			var now = new Date();
-			// Define second, minute, hour, and day variables
-			var oneSecond = 1000; // 1,000 milliseconds
-			var oneMinute = oneSecond * 60;
-			var oneHour = oneMinute * 60;
-			var oneDay = oneHour * 24;
-			if (event.fullDayEvent) {
-				if (event.today) {
-					timeWrapper.innerHTML = this.capFirst(this.translate("TODAY"));
-				} else if (event.startDate - now < oneDay && event.startDate - now > 0) {
-					timeWrapper.innerHTML = this.capFirst(this.translate("TOMORROW"));
-				} else if (event.startDate - now < 2 * oneDay && event.startDate - now > 0) {
-					if (this.translate("DAYAFTERTOMORROW") !== "DAYAFTERTOMORROW") {
-						timeWrapper.innerHTML = this.capFirst(this.translate("DAYAFTERTOMORROW"));
-					} else {
-						timeWrapper.innerHTML = this.capFirst(moment(event.startDate, "x").fromNow());
-					}
+			if (this.config.timeFormat === "dateheaders") {
+				if (event.fullDayEvent) {
+					titleWrapper.colSpan = "2";
+					titleWrapper.align = "left";
 				} else {
-					/* Check to see if the user displays absolute or relative dates with their events
-					 * Also check to see if an event is happening within an 'urgency' time frameElement
-					 * For example, if the user set an .urgency of 7 days, those events that fall within that
-					 * time frame will be displayed with 'in xxx' time format or moment.fromNow()
-					 *
-					 * Note: this needs to be put in its own function, as the whole thing repeats again verbatim
-					 */
-					if (this.config.timeFormat === "absolute") {
-						if ((this.config.urgency > 1) && (event.startDate - now < (this.config.urgency * oneDay))) {
-							// This event falls within the config.urgency period that the user has set
-							timeWrapper.innerHTML = this.capFirst(moment(event.startDate, "x").fromNow());
-						} else {
-							timeWrapper.innerHTML = this.capFirst(moment(event.startDate, "x").format(this.config.fullDayEventDateFormat));
-						}
-					} else {
-						timeWrapper.innerHTML = this.capFirst(moment(event.startDate, "x").fromNow());
-					}
+					timeWrapper = document.createElement("td");
+					timeWrapper.className = "time light " + this.timeClassForUrl(event.url);
+					timeWrapper.align = "left";
+					timeWrapper.style.paddingLeft = "2px";
+					timeWrapper.innerHTML = moment(event.startDate, "x").format("LT");
+					eventWrapper.appendChild(timeWrapper);
+					titleWrapper.align = "right";
 				}
+
+				eventWrapper.appendChild(titleWrapper);
 			} else {
-				if (event.startDate >= new Date()) {
-					if (event.startDate - now < 2 * oneDay) {
-						// This event is within the next 48 hours (2 days)
-						if (event.startDate - now < this.config.getRelative * oneHour) {
-							// If event is within 6 hour, display 'in xxx' time format or moment.fromNow()
-							timeWrapper.innerHTML = this.capFirst(moment(event.startDate, "x").fromNow());
+				timeWrapper = document.createElement("td");
+
+				eventWrapper.appendChild(titleWrapper);
+				var now = new Date();
+				// Define second, minute, hour, and day variables
+				var oneSecond = 1000; // 1,000 milliseconds
+				var oneMinute = oneSecond * 60;
+				var oneHour = oneMinute * 60;
+				var oneDay = oneHour * 24;
+				if (event.fullDayEvent) {
+					//subtract one second so that fullDayEvents end at 23:59:59, and not at 0:00:00 one the next day
+					event.endDate -= oneSecond;
+					if (event.today) {
+						timeWrapper.innerHTML = this.capFirst(this.translate("TODAY"));
+					} else if (event.startDate - now < oneDay && event.startDate - now > 0) {
+						timeWrapper.innerHTML = this.capFirst(this.translate("TOMORROW"));
+					} else if (event.startDate - now < 2 * oneDay && event.startDate - now > 0) {
+						if (this.translate("DAYAFTERTOMORROW") !== "DAYAFTERTOMORROW") {
+							timeWrapper.innerHTML = this.capFirst(this.translate("DAYAFTERTOMORROW"));
 						} else {
-							// Otherwise just say 'Today/Tomorrow at such-n-such time'
-							timeWrapper.innerHTML = this.capFirst(moment(event.startDate, "x").calendar());
+							timeWrapper.innerHTML = this.capFirst(moment(event.startDate, "x").fromNow());
 						}
 					} else {
 						/* Check to see if the user displays absolute or relative dates with their events
@@ -242,42 +310,102 @@ Module.register("calendar", {
 						 * Note: this needs to be put in its own function, as the whole thing repeats again verbatim
 						 */
 						if (this.config.timeFormat === "absolute") {
-							if ((this.config.urgency > 1) && (event.startDate - now < (this.config.urgency * oneDay))) {
+							if (this.config.urgency > 1 && event.startDate - now < this.config.urgency * oneDay) {
 								// This event falls within the config.urgency period that the user has set
-								timeWrapper.innerHTML = this.capFirst(moment(event.startDate, "x").fromNow());
+								timeWrapper.innerHTML = this.capFirst(moment(event.startDate, "x").from(moment().format("YYYYMMDD")));
 							} else {
-								timeWrapper.innerHTML = this.capFirst(moment(event.startDate, "x").format(this.config.dateFormat));
+								timeWrapper.innerHTML = this.capFirst(moment(event.startDate, "x").format(this.config.fullDayEventDateFormat));
 							}
 						} else {
-							timeWrapper.innerHTML = this.capFirst(moment(event.startDate, "x").fromNow());
+							timeWrapper.innerHTML = this.capFirst(moment(event.startDate, "x").from(moment().format("YYYYMMDD")));
 						}
 					}
+					if (this.config.showEnd) {
+						timeWrapper.innerHTML += "-";
+						timeWrapper.innerHTML += this.capFirst(moment(event.endDate, "x").format(this.config.fullDayEventDateFormat));
+					}
 				} else {
-					timeWrapper.innerHTML = this.capFirst(
-						this.translate("RUNNING", {
-							fallback: this.translate("RUNNING") + " {timeUntilEnd}",
-							timeUntilEnd: moment(event.endDate, "x").fromNow(true)
-						})
-					);
+					if (event.startDate >= new Date()) {
+						if (event.startDate - now < 2 * oneDay) {
+							// This event is within the next 48 hours (2 days)
+							if (event.startDate - now < this.config.getRelative * oneHour) {
+								// If event is within 6 hour, display 'in xxx' time format or moment.fromNow()
+								timeWrapper.innerHTML = this.capFirst(moment(event.startDate, "x").fromNow());
+							} else {
+								if (this.config.timeFormat === "absolute" && !this.config.nextDaysRelative) {
+									timeWrapper.innerHTML = this.capFirst(moment(event.startDate, "x").format(this.config.dateFormat));
+								} else {
+									// Otherwise just say 'Today/Tomorrow at such-n-such time'
+									timeWrapper.innerHTML = this.capFirst(moment(event.startDate, "x").calendar());
+								}
+							}
+						} else {
+							/* Check to see if the user displays absolute or relative dates with their events
+							 * Also check to see if an event is happening within an 'urgency' time frameElement
+							 * For example, if the user set an .urgency of 7 days, those events that fall within that
+							 * time frame will be displayed with 'in xxx' time format or moment.fromNow()
+							 *
+							 * Note: this needs to be put in its own function, as the whole thing repeats again verbatim
+							 */
+							if (this.config.timeFormat === "absolute") {
+								if (this.config.urgency > 1 && event.startDate - now < this.config.urgency * oneDay) {
+									// This event falls within the config.urgency period that the user has set
+									timeWrapper.innerHTML = this.capFirst(moment(event.startDate, "x").fromNow());
+								} else {
+									timeWrapper.innerHTML = this.capFirst(moment(event.startDate, "x").format(this.config.dateFormat));
+								}
+							} else {
+								timeWrapper.innerHTML = this.capFirst(moment(event.startDate, "x").fromNow());
+							}
+						}
+					} else {
+						timeWrapper.innerHTML = this.capFirst(
+							this.translate("RUNNING", {
+								fallback: this.translate("RUNNING") + " {timeUntilEnd}",
+								timeUntilEnd: moment(event.endDate, "x").fromNow(true)
+							})
+						);
+					}
+					if (this.config.showEnd) {
+						timeWrapper.innerHTML += "-";
+						timeWrapper.innerHTML += this.capFirst(moment(event.endDate, "x").format(this.config.dateEndFormat));
+					}
 				}
+				//timeWrapper.innerHTML += ' - '+ moment(event.startDate,'x').format('lll');
+				timeWrapper.className = "time light " + this.timeClassForUrl(event.url);
+				eventWrapper.appendChild(timeWrapper);
 			}
-			//timeWrapper.innerHTML += ' - '+ moment(event.startDate,'x').format('lll');
-			//console.log(event);
-			timeWrapper.className = "time light";
-			eventWrapper.appendChild(timeWrapper);
 
 			wrapper.appendChild(eventWrapper);
 
 			// Create fade effect.
-			if (this.config.fade && this.config.fadePoint < 1) {
-				if (this.config.fadePoint < 0) {
-					this.config.fadePoint = 0;
-				}
-				var startingPoint = events.length * this.config.fadePoint;
-				var steps = events.length - startingPoint;
-				if (e >= startingPoint) {
-					var currentStep = e - startingPoint;
-					eventWrapper.style.opacity = 1 - (1 / steps * currentStep);
+			if (e >= startFade) {
+				currentFadeStep = e - startFade;
+				eventWrapper.style.opacity = 1 - (1 / fadeSteps) * currentFadeStep;
+			}
+
+			if (this.config.showLocation) {
+				if (event.location !== false) {
+					var locationRow = document.createElement("tr");
+					locationRow.className = "normal xsmall light";
+
+					if (this.config.displaySymbol) {
+						var symbolCell = document.createElement("td");
+						locationRow.appendChild(symbolCell);
+					}
+
+					var descCell = document.createElement("td");
+					descCell.className = "location";
+					descCell.colSpan = "2";
+					descCell.innerHTML = this.titleTransform(event.location, this.config.locationTitleReplace, this.config.wrapLocationEvents, this.config.maxLocationTitleLength, this.config.maxEventTitleLines);
+					locationRow.appendChild(descCell);
+
+					wrapper.appendChild(locationRow);
+
+					if (e >= startFade) {
+						currentFadeStep = e - startFade;
+						locationRow.style.opacity = 1 - (1 / fadeSteps) * currentFadeStep;
+					}
 				}
 			}
 		}
@@ -293,20 +421,17 @@ Module.register("calendar", {
 	 * @param {number} timeFormat Specifies either 12 or 24 hour time format
 	 * @returns {moment.LocaleSpecification}
 	 */
-	getLocaleSpecification: function(timeFormat) {
+	getLocaleSpecification: function (timeFormat) {
 		switch (timeFormat) {
-		case 12: {
-			return { longDateFormat: {LT: "h:mm A"} };
-			break;
-		}
-		case 24: {
-			return { longDateFormat: {LT: "HH:mm"} };
-			break;
-		}
-		default: {
-			return { longDateFormat: {LT: moment.localeData().longDateFormat("LT")} };
-			break;
-		}
+			case 12: {
+				return { longDateFormat: { LT: "h:mm A" } };
+			}
+			case 24: {
+				return { longDateFormat: { LT: "HH:mm" } };
+			}
+			default: {
+				return { longDateFormat: { LT: moment.localeData().longDateFormat("LT") } };
+			}
 		}
 	},
 
@@ -336,29 +461,81 @@ Module.register("calendar", {
 	createEventList: function () {
 		var events = [];
 		var today = moment().startOf("day");
+		var now = new Date();
+		var future = moment().startOf("day").add(this.config.maximumNumberOfDays, "days").toDate();
 		for (var c in this.calendarData) {
 			var calendar = this.calendarData[c];
 			for (var e in calendar) {
-				var event = calendar[e];
-				if(this.config.hidePrivate) {
-					if(event.class === "PRIVATE") {
-						  // do not add the current event, skip it
-						  continue;
+				var event = JSON.parse(JSON.stringify(calendar[e])); // clone object
+				if (event.endDate < now) {
+					continue;
+				}
+				if (this.config.hidePrivate) {
+					if (event.class === "PRIVATE") {
+						// do not add the current event, skip it
+						continue;
 					}
 				}
+				if (this.config.hideOngoing) {
+					if (event.startDate < now) {
+						continue;
+					}
+				}
+				if (this.listContainsEvent(events, event)) {
+					continue;
+				}
 				event.url = c;
-				event.today = event.startDate >= today && event.startDate < (today + 24 * 60 * 60 * 1000);
-				events.push(event);
+				event.today = event.startDate >= today && event.startDate < today + 24 * 60 * 60 * 1000;
+
+				/* if sliceMultiDayEvents is set to true, multiday events (events exceeding at least one midnight) are sliced into days,
+				 * otherwise, esp. in dateheaders mode it is not clear how long these events are.
+				 */
+				var maxCount = Math.ceil((event.endDate - 1 - moment(event.startDate, "x").endOf("day").format("x")) / (1000 * 60 * 60 * 24)) + 1;
+				if (this.config.sliceMultiDayEvents && maxCount > 1) {
+					var splitEvents = [];
+					var midnight = moment(event.startDate, "x").clone().startOf("day").add(1, "day").format("x");
+					var count = 1;
+					while (event.endDate > midnight) {
+						var thisEvent = JSON.parse(JSON.stringify(event)); // clone object
+						thisEvent.today = thisEvent.startDate >= today && thisEvent.startDate < today + 24 * 60 * 60 * 1000;
+						thisEvent.endDate = midnight;
+						thisEvent.title += " (" + count + "/" + maxCount + ")";
+						splitEvents.push(thisEvent);
+
+						event.startDate = midnight;
+						count += 1;
+						midnight = moment(midnight, "x").add(1, "day").format("x"); // next day
+					}
+					// Last day
+					event.title += " (" + count + "/" + maxCount + ")";
+					splitEvents.push(event);
+
+					for (event of splitEvents) {
+						if (event.endDate > now && event.endDate <= future) {
+							events.push(event);
+						}
+					}
+				} else {
+					events.push(event);
+				}
 			}
 		}
 
 		events.sort(function (a, b) {
 			return a.startDate - b.startDate;
 		});
-
 		return events.slice(0, this.config.maximumEntries);
 	},
 
+	listContainsEvent: function (eventList, event) {
+		for (var evt of eventList) {
+			if (evt.title === event.title && parseInt(evt.startDate) === parseInt(event.startDate)) {
+				return true;
+			}
+		}
+		return false;
+	},
+
 	/* createEventList(url)
 	 * Requests node helper to add calendar url.
 	 *
@@ -366,16 +543,22 @@ Module.register("calendar", {
 	 */
 	addCalendar: function (url, auth, calendarConfig) {
 		this.sendSocketNotification("ADD_CALENDAR", {
+			id: this.identifier,
 			url: url,
 			excludedEvents: calendarConfig.excludedEvents || this.config.excludedEvents,
 			maximumEntries: calendarConfig.maximumEntries || this.config.maximumEntries,
 			maximumNumberOfDays: calendarConfig.maximumNumberOfDays || this.config.maximumNumberOfDays,
 			fetchInterval: this.config.fetchInterval,
-			auth: auth
+			symbolClass: calendarConfig.symbolClass,
+			titleClass: calendarConfig.titleClass,
+			timeClass: calendarConfig.timeClass,
+			auth: auth,
+			broadcastPastEvents: calendarConfig.broadcastPastEvents || this.config.broadcastPastEvents
 		});
 	},
 
-	/* symbolsForUrl(url)
+	/**
+	 * symbolsForUrl(url)
 	 * Retrieves the symbols for a specific url.
 	 *
 	 * argument url string - Url to look for.
@@ -386,6 +569,53 @@ Module.register("calendar", {
 		return this.getCalendarProperty(url, "symbol", this.config.defaultSymbol);
 	},
 
+	/**
+	 * symbolClassForUrl(url)
+	 * Retrieves the symbolClass for a specific url.
+	 *
+	 * @param url string - Url to look for.
+	 *
+	 * @returns string
+	 */
+	symbolClassForUrl: function (url) {
+		return this.getCalendarProperty(url, "symbolClass", "");
+	},
+
+	/**
+	 * titleClassForUrl(url)
+	 * Retrieves the titleClass for a specific url.
+	 *
+	 * @param url string - Url to look for.
+	 *
+	 * @returns string
+	 */
+	titleClassForUrl: function (url) {
+		return this.getCalendarProperty(url, "titleClass", "");
+	},
+
+	/**
+	 * timeClassForUrl(url)
+	 * Retrieves the timeClass for a specific url.
+	 *
+	 * @param url string - Url to look for.
+	 *
+	 * @returns string
+	 */
+	timeClassForUrl: function (url) {
+		return this.getCalendarProperty(url, "timeClass", "");
+	},
+
+	/* calendarNameForUrl(url)
+	 * Retrieves the calendar name for a specific url.
+	 *
+	 * argument url string - Url to look for.
+	 *
+	 * return string - The name of the calendar
+	 */
+	calendarNameForUrl: function (url) {
+		return this.getCalendarProperty(url, "name", "");
+	},
+
 	/* colorForUrl(url)
 	 * Retrieves the color for a specific url.
 	 *
@@ -434,9 +664,10 @@ Module.register("calendar", {
 	 * @param {string} string Text string to shorten
 	 * @param {number} maxLength The max length of the string
 	 * @param {boolean} wrapEvents Wrap the text after the line has reached maxLength
+	 * @param {number} maxTitleLines The max number of vertical lines before cutting event title
 	 * @returns {string} The shortened string
 	 */
-	shorten: function (string, maxLength, wrapEvents) {
+	shorten: function (string, maxLength, wrapEvents, maxTitleLines) {
 		if (typeof string !== "string") {
 			return "";
 		}
@@ -445,16 +676,26 @@ Module.register("calendar", {
 			var temp = "";
 			var currentLine = "";
 			var words = string.split(" ");
+			var line = 0;
 
 			for (var i = 0; i < words.length; i++) {
 				var word = words[i];
-				if (currentLine.length + word.length < (typeof maxLength === "number" ? maxLength : 25) - 1) { // max - 1 to account for a space
-					currentLine += (word + " ");
+				if (currentLine.length + word.length < (typeof maxLength === "number" ? maxLength : 25) - 1) {
+					// max - 1 to account for a space
+					currentLine += word + " ";
 				} else {
+					line++;
+					if (line > maxTitleLines - 1) {
+						if (i < words.length) {
+							currentLine += "&hellip;";
+						}
+						break;
+					}
+
 					if (currentLine.length > 0) {
-						temp += (currentLine + "<br>" + word + " ");
+						temp += currentLine + "<br>" + word + " ";
 					} else {
-						temp += (word + "<br>");
+						temp += word + "<br>";
 					}
 					currentLine = "";
 				}
@@ -474,7 +715,6 @@ Module.register("calendar", {
 	 * Capitalize the first letter of a string
 	 * Return capitalized string
 	 */
-
 	capFirst: function (string) {
 		return string.charAt(0).toUpperCase() + string.slice(1);
 	},
@@ -488,20 +728,20 @@ Module.register("calendar", {
 	 *
 	 * return string - The transformed title.
 	 */
-	titleTransform: function (title) {
-		for (var needle in this.config.titleReplace) {
-			var replacement = this.config.titleReplace[needle];
+	titleTransform: function (title, titleReplace, wrapEvents, maxTitleLength, maxTitleLines) {
+		for (var needle in titleReplace) {
+			var replacement = titleReplace[needle];
 
 			var regParts = needle.match(/^\/(.+)\/([gim]*)$/);
 			if (regParts) {
-			  // the parsed pattern is a regexp.
-			  needle = new RegExp(regParts[1], regParts[2]);
+				// the parsed pattern is a regexp.
+				needle = new RegExp(regParts[1], regParts[2]);
 			}
 
 			title = title.replace(needle, replacement);
 		}
 
-		title = this.shorten(title, this.config.maxTitleLength, this.config.wrapEvents);
+		title = this.shorten(title, maxTitleLength, wrapEvents, maxTitleLines);
 		return title;
 	},
 
@@ -516,17 +756,17 @@ Module.register("calendar", {
 			for (var e in calendar) {
 				var event = cloneObject(calendar[e]);
 				event.symbol = this.symbolsForUrl(url);
+				event.calendarName = this.calendarNameForUrl(url);
 				event.color = this.colorForUrl(url);
 				delete event.url;
 				eventList.push(event);
 			}
 		}
 
-		eventList.sort(function(a,b) {
+		eventList.sort(function (a, b) {
 			return a.startDate - b.startDate;
 		});
 
 		this.sendNotification("CALENDAR_EVENTS", eventList);
-
 	}
 });

modules/default/calendar/calendarfetcher.js

@@ -1,83 +1,88 @@
 /* Magic Mirror
  * Node Helper: Calendar - CalendarFetcher
  *
- * By Michael Teeuw http://michaelteeuw.nl
+ * By Michael Teeuw https://michaelteeuw.nl
  * MIT Licensed.
  */
+const Log = require("../../../js/logger.js");
+const ical = require("ical");
+const moment = require("moment");
+const request = require("request");
 
-var ical = require("./vendor/ical.js");
-var moment = require("moment");
+const CalendarFetcher = function (url, reloadInterval, excludedEvents, maximumNumberOfDays, auth, includePastEvents) {
+	const self = this;
 
-var CalendarFetcher = function(url, reloadInterval, excludedEvents, maximumEntries, maximumNumberOfDays, auth) {
-	var self = this;
+	let reloadTimer = null;
+	let events = [];
 
-	var reloadTimer = null;
-	var events = [];
-
-	var fetchFailedCallback = function() {};
-	var eventsReceivedCallback = function() {};
+	let fetchFailedCallback = function () {};
+	let eventsReceivedCallback = function () {};
 
 	/* fetchCalendar()
 	 * Initiates calendar fetch.
 	 */
-	var fetchCalendar = function() {
-
+	const fetchCalendar = function () {
 		clearTimeout(reloadTimer);
 		reloadTimer = null;
 
-		nodeVersion = Number(process.version.match(/^v(\d+\.\d+)/)[1]);
-		var opts = {
+		const nodeVersion = Number(process.version.match(/^v(\d+\.\d+)/)[1]);
+		const opts = {
 			headers: {
-				"User-Agent": "Mozilla/5.0 (Node.js "+ nodeVersion + ") MagicMirror/"  + global.version +  " (https://github.com/MichMich/MagicMirror/)"
-			}
+				"User-Agent": "Mozilla/5.0 (Node.js " + nodeVersion + ") MagicMirror/" + global.version + " (https://github.com/MichMich/MagicMirror/)"
+			},
+			gzip: true
 		};
 
 		if (auth) {
-			if(auth.method === "bearer"){
+			if (auth.method === "bearer") {
 				opts.auth = {
 					bearer: auth.pass
-				}
-
-			}else{
+				};
+			} else {
 				opts.auth = {
 					user: auth.user,
-					pass: auth.pass
+					pass: auth.pass,
+					sendImmediately: auth.method !== "digest"
 				};
-
-				if(auth.method === "digest"){
-					opts.auth.sendImmediately = false;
-				}else{
-					opts.auth.sendImmediately = true;
-				}
 			}
 		}
 
-		ical.fromURL(url, opts, function(err, data) {
+		request(url, opts, function (err, r, requestData) {
 			if (err) {
 				fetchFailedCallback(self, err);
 				scheduleTimer();
 				return;
+			} else if (r.statusCode !== 200) {
+				fetchFailedCallback(self, r.statusCode + ": " + r.statusMessage);
+				scheduleTimer();
+				return;
 			}
 
-			// console.log(data);
-			newEvents = [];
+			const data = ical.parseICS(requestData);
+			const newEvents = [];
 
-			var limitFunction = function(date, i) {return i < maximumEntries;};
-
-			var eventDate = function(event, time) {
-				return (event[time].length === 8) ? moment(event[time], "YYYYMMDD") : moment(new Date(event[time]));
+			// limitFunction doesn't do much limiting, see comment re: the dates array in rrule section below as to why we need to do the filtering ourselves
+			const limitFunction = function (date, i) {
+				return true;
 			};
 
-			for (var e in data) {
-				var event = data[e];
-				var now = new Date();
-				var today = moment().startOf("day").toDate();
-				var future = moment().startOf("day").add(maximumNumberOfDays, "days").subtract(1,"seconds").toDate(); // Subtract 1 second so that events that start on the middle of the night will not repeat.
+			const eventDate = function (event, time) {
+				return event[time].length === 8 ? moment(event[time], "YYYYMMDD") : moment(new Date(event[time]));
+			};
 
-				// FIXME:
-				// Ugly fix to solve the facebook birthday issue.
+			Object.entries(data).forEach(([key, event]) => {
+				const now = new Date();
+				const today = moment().startOf("day").toDate();
+				const future = moment().startOf("day").add(maximumNumberOfDays, "days").subtract(1, "seconds").toDate(); // Subtract 1 second so that events that start on the middle of the night will not repeat.
+				let past = today;
+
+				if (includePastEvents) {
+					past = moment().startOf("day").subtract(maximumNumberOfDays, "days").toDate();
+				}
+
+				// FIXME: Ugly fix to solve the facebook birthday issue.
 				// Otherwise, the recurring events only show the birthday for next year.
-				var isFacebookBirthday = false;
+				let isFacebookBirthday = false;
 				if (typeof event.uid !== "undefined") {
 					if (event.uid.indexOf("@facebook.com") !== -1) {
 						isFacebookBirthday = true;
@@ -85,11 +90,13 @@ var CalendarFetcher = function(url, reloadInterval, excludedEvents, maximumEntri
 				}
 
 				if (event.type === "VEVENT") {
+					let startDate = eventDate(event, "start");
+					let endDate;
 
-					var startDate = eventDate(event, "start");
-					var endDate;
 					if (typeof event.end !== "undefined") {
 						endDate = eventDate(event, "end");
+					} else if (typeof event.duration !== "undefined") {
+						endDate = startDate.clone().add(moment.duration(event.duration));
 					} else {
 						if (!isFacebookBirthday) {
 							endDate = startDate;
@@ -98,48 +105,155 @@ var CalendarFetcher = function(url, reloadInterval, excludedEvents, maximumEntri
 						}
 					}
 
-
-					// calculate the duration f the event for use with recurring events.
-					var duration = parseInt(endDate.format("x")) - parseInt(startDate.format("x"));
+					// calculate the duration of the event for use with recurring events.
+					let duration = parseInt(endDate.format("x")) - parseInt(startDate.format("x"));
 
 					if (event.start.length === 8) {
 						startDate = startDate.startOf("day");
 					}
 
-					var title = "Event";
-					if (event.summary) {
-						title = (typeof event.summary.val !== "undefined") ? event.summary.val : event.summary;
-					} else if(event.description) {
-						title = event.description;
-					}
+					const title = getTitleFromEvent(event);
 
-					var excluded = false;
-					for (var f in excludedEvents) {
-						var filter = excludedEvents[f];
-						if (title.toLowerCase().includes(filter.toLowerCase())) {
-							excluded = true;
+					let excluded = false,
+						dateFilter = null;
+
+					for (let f in excludedEvents) {
+						let filter = excludedEvents[f],
+							testTitle = title.toLowerCase(),
+							until = null,
+							useRegex = false,
+							regexFlags = "g";
+
+						if (filter instanceof Object) {
+							if (typeof filter.until !== "undefined") {
+								until = filter.until;
+							}
+
+							if (typeof filter.regex !== "undefined") {
+								useRegex = filter.regex;
+							}
+
+							// If additional advanced filtering is added in, this section
+							// must remain last as we overwrite the filter object with the
+							// filterBy string
+							if (filter.caseSensitive) {
+								filter = filter.filterBy;
+								testTitle = title;
+							} else if (useRegex) {
+								filter = filter.filterBy;
+								testTitle = title;
+								regexFlags += "i";
+							} else {
+								filter = filter.filterBy.toLowerCase();
+							}
+						} else {
+							filter = filter.toLowerCase();
+						}
+
+						if (testTitleByFilter(testTitle, filter, useRegex, regexFlags)) {
+							if (until) {
+								dateFilter = until;
+							} else {
+								excluded = true;
+							}
 							break;
 						}
 					}
 
 					if (excluded) {
-						continue;
+						return;
 					}
 
-					var location = event.location || false;
-					var geo = event.geo || false;
-					var description = event.description || false;
+					const location = event.location || false;
+					const geo = event.geo || false;
+					const description = event.description || false;
 
-					if (typeof event.rrule != "undefined" && !isFacebookBirthday) {
-						var rule = event.rrule;
-						var dates = rule.between(today, future, true, limitFunction);
+					if (typeof event.rrule !== "undefined" && event.rrule !== null && !isFacebookBirthday) {
+						const rule = event.rrule;
+						let addedEvents = 0;
 
-						for (var d in dates) {
-							startDate = moment(new Date(dates[d]));
-							endDate  = moment(parseInt(startDate.format("x")) + duration, "x");
-							if (endDate.format("x") > now) {
+						const pastMoment = moment(past);
+						const futureMoment = moment(future);
+
+						// can cause problems with e.g. birthdays before 1900
+						if ((rule.options && rule.origOptions && rule.origOptions.dtstart && rule.origOptions.dtstart.getFullYear() < 1900) || (rule.options && rule.options.dtstart && rule.options.dtstart.getFullYear() < 1900)) {
+							rule.origOptions.dtstart.setYear(1900);
+							rule.options.dtstart.setYear(1900);
+						}
+
+						// For recurring events, get the set of start dates that fall within the range
+						// of dates we're looking for.
+						// kblankenship1989 - to fix issue #1798, converting all dates to locale time first, then converting back to UTC time
+						const pastLocal = pastMoment.subtract(past.getTimezoneOffset(), "minutes").toDate();
+						const futureLocal = futureMoment.subtract(future.getTimezoneOffset(), "minutes").toDate();
+						const datesLocal = rule.between(pastLocal, futureLocal, true, limitFunction);
+						const dates = datesLocal.map(function (dateLocal) {
+							return moment(dateLocal).add(dateLocal.getTimezoneOffset(), "minutes").toDate();
+						});
+
+						// The "dates" array contains the set of dates within our desired date range range that are valid
+						// for the recurrence rule. *However*, it's possible for us to have a specific recurrence that
+						// had its date changed from outside the range to inside the range.  For the time being,
+						// we'll handle this by adding *all* recurrence entries into the set of dates that we check,
+						// because the logic below will filter out any recurrences that don't actually belong within
+						// our display range.
+						// Would be great if there was a better way to handle this.
+						if (event.recurrences !== undefined) {
+							for (let r in event.recurrences) {
+								// Only add dates that weren't already in the range we added from the rrule so that
+								// we don"t double-add those events.
+								if (moment(new Date(r)).isBetween(pastMoment, futureMoment) !== true) {
+									dates.push(new Date(r));
+								}
+							}
+						}
+
+						// Loop through the set of date entries to see which recurrences should be added to our event list.
+						for (let d in dates) {
+							const date = dates[d];
+							// ical.js started returning recurrences and exdates as ISOStrings without time information.
+							// .toISOString().substring(0,10) is the method they use to calculate keys, so we'll do the same
+							// (see https://github.com/peterbraden/ical.js/pull/84 )
+							const dateKey = date.toISOString().substring(0, 10);
+							let curEvent = event;
+							let showRecurrence = true;
+
+							startDate = moment(date);
+
+							// For each date that we're checking, it's possible that there is a recurrence override for that one day.
+							if (curEvent.recurrences !== undefined && curEvent.recurrences[dateKey] !== undefined) {
+								// We found an override, so for this recurrence, use a potentially different title, start date, and duration.
+								curEvent = curEvent.recurrences[dateKey];
+								startDate = moment(curEvent.start);
+								duration = parseInt(moment(curEvent.end).format("x")) - parseInt(startDate.format("x"));
+							}
+							// If there's no recurrence override, check for an exception date.  Exception dates represent exceptions to the rule.
+							else if (curEvent.exdate !== undefined && curEvent.exdate[dateKey] !== undefined) {
+								// This date is an exception date, which means we should skip it in the recurrence pattern.
+								showRecurrence = false;
+							}
+
+							endDate = moment(parseInt(startDate.format("x")) + duration, "x");
+							if (startDate.format("x") === endDate.format("x")) {
+								endDate = endDate.endOf("day");
+							}
+
+							const recurrenceTitle = getTitleFromEvent(curEvent);
+
+							// If this recurrence ends before the start of the date range, or starts after the end of the date range, don"t add
+							// it to the event list.
+							if (endDate.isBefore(past) || startDate.isAfter(future)) {
+								showRecurrence = false;
+							}
+
+							if (timeFilterApplies(now, endDate, dateFilter)) {
+								showRecurrence = false;
+							}
+
+							if (showRecurrence === true) {
+								addedEvents++;
 								newEvents.push({
-									title: title,
+									title: recurrenceTitle,
 									startDate: startDate.format("x"),
 									endDate: endDate.format("x"),
 									fullDayEvent: isFullDayEvent(event),
@@ -151,28 +265,43 @@ var CalendarFetcher = function(url, reloadInterval, excludedEvents, maximumEntri
 								});
 							}
 						}
+						// end recurring event parsing
 					} else {
-						// console.log("Single event ...");
 						// Single event.
-						var fullDayEvent = (isFacebookBirthday) ? true : isFullDayEvent(event);
+						const fullDayEvent = isFacebookBirthday ? true : isFullDayEvent(event);
 
-						if (!fullDayEvent && endDate < new Date()) {
-							//console.log("It's not a fullday event, and it is in the past. So skip: " + title);
-							continue;
-						}
-
-						if (fullDayEvent && endDate <= today) {
-							//console.log("It's a fullday event, and it is before today. So skip: " + title);
-							continue;
+						if (includePastEvents) {
+							// Past event is too far in the past, so skip.
+							if (endDate < past) {
+								return;
+							}
+						} else {
+							// It's not a fullday event, and it is in the past, so skip.
+							if (!fullDayEvent && endDate < new Date()) {
+								return;
+							}
+
+							// It's a fullday event, and it is before today, So skip.
+							if (fullDayEvent && endDate <= today) {
+								return;
+							}
 						}
 
+						// It exceeds the maximumNumberOfDays limit, so skip.
 						if (startDate > future) {
-							//console.log("It exceeds the maximumNumberOfDays limit. So skip: " + title);
-							continue;
+							return;
+						}
+
+						if (timeFilterApplies(now, endDate, dateFilter)) {
+							return;
+						}
+
+						// Adjust start date so multiple day events will be displayed as happening today even though they started some days ago already
+						if (fullDayEvent && startDate <= today) {
+							startDate = moment(today);
 						}
 
 						// Every thing is good. Add it to the list.
-
 						newEvents.push({
 							title: title,
 							startDate: startDate.format("x"),
@@ -183,18 +312,15 @@ var CalendarFetcher = function(url, reloadInterval, excludedEvents, maximumEntri
 							geo: geo,
 							description: description
 						});
-
 					}
 				}
-			}
+			});
 
-			newEvents.sort(function(a, b) {
+			newEvents.sort(function (a, b) {
 				return a.startDate - b.startDate;
 			});
 
-			//console.log(newEvents);
-
-			events = newEvents.slice(0, maximumEntries);
+			events = newEvents;
 
 			self.broadcastEvents();
 			scheduleTimer();
@@ -204,10 +330,9 @@ var CalendarFetcher = function(url, reloadInterval, excludedEvents, maximumEntri
 	/* scheduleTimer()
 	 * Schedule the timer for the next update.
 	 */
-	var scheduleTimer = function() {
-		//console.log('Schedule update timer.');
+	const scheduleTimer = function () {
 		clearTimeout(reloadTimer);
-		reloadTimer = setTimeout(function() {
+		reloadTimer = setTimeout(function () {
 			fetchCalendar();
 		}, reloadInterval);
 	};
@@ -215,20 +340,19 @@ var CalendarFetcher = function(url, reloadInterval, excludedEvents, maximumEntri
 	/* isFullDayEvent(event)
 	 * Checks if an event is a fullday event.
 	 *
-	 * argument event obejct - The event object to check.
+	 * argument event object - The event object to check.
 	 *
 	 * return bool - The event is a fullday event.
 	 */
-	var isFullDayEvent = function(event) {
-		if (event.start.length === 8) {
+	const isFullDayEvent = function (event) {
+		if (event.start.length === 8 || event.start.dateOnly) {
 			return true;
 		}
 
-		var start = event.start || 0;
-		var startDate = new Date(start);
-		var end = event.end || 0;
-
-		if (end - start === 24 * 60 * 60 * 1000 && startDate.getHours() === 0 && startDate.getMinutes() === 0) {
+		const start = event.start || 0;
+		const startDate = new Date(start);
+		const end = event.end || 0;
+		if ((end - start) % (24 * 60 * 60 * 1000) === 0 && startDate.getHours() === 0 && startDate.getMinutes() === 0) {
 			// Is 24 hours, and starts on the middle of the night.
 			return true;
 		}
@@ -236,20 +360,76 @@ var CalendarFetcher = function(url, reloadInterval, excludedEvents, maximumEntri
 		return false;
 	};
 
+	/* timeFilterApplies()
+	 * Determines if the user defined time filter should apply
+	 *
+	 * argument now Date - Date object using previously created object for consistency
+	 * argument endDate Moment - Moment object representing the event end date
+	 * argument filter string - The time to subtract from the end date to determine if an event should be shown
+	 *
+	 * return bool - The event should be filtered out
+	 */
+	const timeFilterApplies = function (now, endDate, filter) {
+		if (filter) {
+			const until = filter.split(" "),
+				value = parseInt(until[0]),
+				increment = until[1].slice(-1) === "s" ? until[1] : until[1] + "s", // Massage the data for moment js
+				filterUntil = moment(endDate.format()).subtract(value, increment);
+
+			return now < filterUntil.format("x");
+		}
+
+		return false;
+	};
+
+	/* getTitleFromEvent(event)
+	 * Gets the title from the event.
+	 *
+	 * argument event object - The event object to check.
+	 *
+	 * return string - The title of the event, or "Event" if no title is found.
+	 */
+	const getTitleFromEvent = function (event) {
+		let title = "Event";
+		if (event.summary) {
+			title = typeof event.summary.val !== "undefined" ? event.summary.val : event.summary;
+		} else if (event.description) {
+			title = event.description;
+		}
+
+		return title;
+	};
+
+	const testTitleByFilter = function (title, filter, useRegex, regexFlags) {
+		if (useRegex) {
+			// Assume if leading slash, there is also trailing slash
+			if (filter[0] === "/") {
+				// Strip leading and trailing slashes
+				filter = filter.substr(1).slice(0, -1);
+			}
+
+			filter = new RegExp(filter, regexFlags);
+
+			return filter.test(title);
+		} else {
+			return title.includes(filter);
+		}
+	};
+
 	/* public methods */
 
 	/* startFetch()
 	 * Initiate fetchCalendar();
 	 */
-	this.startFetch = function() {
+	this.startFetch = function () {
 		fetchCalendar();
 	};
 
 	/* broadcastItems()
 	 * Broadcast the existing events.
 	 */
-	this.broadcastEvents = function() {
-		//console.log('Broadcasting ' + events.length + ' events.');
+	this.broadcastEvents = function () {
+		Log.info("Calendar-Fetcher: Broadcasting " + events.length + " events.");
 		eventsReceivedCallback(self);
 	};
 
@@ -258,7 +438,7 @@ var CalendarFetcher = function(url, reloadInterval, excludedEvents, maximumEntri
 	 *
 	 * argument callback function - The on success callback.
 	 */
-	this.onReceive = function(callback) {
+	this.onReceive = function (callback) {
 		eventsReceivedCallback = callback;
 	};
 
@@ -267,7 +447,7 @@ var CalendarFetcher = function(url, reloadInterval, excludedEvents, maximumEntri
 	 *
 	 * argument callback function - The on error callback.
 	 */
-	this.onError = function(callback) {
+	this.onError = function (callback) {
 		fetchFailedCallback = callback;
 	};
 
@@ -276,7 +456,7 @@ var CalendarFetcher = function(url, reloadInterval, excludedEvents, maximumEntri
 	 *
 	 * return string - The url of this fetcher.
 	 */
-	this.url = function() {
+	this.url = function () {
 		return url;
 	};
 
@@ -285,11 +465,9 @@ var CalendarFetcher = function(url, reloadInterval, excludedEvents, maximumEntri
 	 *
 	 * return array - The current available events for this fetcher.
 	 */
-	this.events = function() {
+	this.events = function () {
 		return events;
 	};
-
 };
 
-
 module.exports = CalendarFetcher;

modules/default/calendar/debug.js

@@ -2,39 +2,37 @@
  * use this script with `node debug.js` to test the fetcher without the need
  * of starting the MagicMirror core. Adjust the values below to your desire.
  *
- * By Michael Teeuw http://michaelteeuw.nl
+ * By Michael Teeuw https://michaelteeuw.nl
  * MIT Licensed.
  */
+const CalendarFetcher = require("./calendarfetcher.js");
 
-var CalendarFetcher = require("./calendarfetcher.js");
-
-var url = "https://calendar.google.com/calendar/ical/pkm1t2uedjbp0uvq1o7oj1jouo%40group.calendar.google.com/private-08ba559f89eec70dd74bbd887d0a3598/basic.ics";  // Standard test URL
-// var url = "https://www.googleapis.com/calendar/v3/calendars/primary/events/"; // URL for Bearer auth (must be configured  in Google OAuth2 first)
-var fetchInterval = 60 * 60 * 1000;
-var maximumEntries = 10;
-var maximumNumberOfDays = 365;
-var user = "magicmirror";
-var pass = "MyStrongPass";
-
-var auth = {
+const url = "https://calendar.google.com/calendar/ical/pkm1t2uedjbp0uvq1o7oj1jouo%40group.calendar.google.com/private-08ba559f89eec70dd74bbd887d0a3598/basic.ics"; // Standard test URL
+//const url = "https://www.googleapis.com/calendar/v3/calendars/primary/events/"; // URL for Bearer auth (must be configured  in Google OAuth2 first)
+const fetchInterval = 60 * 60 * 1000;
+const maximumEntries = 10;
+const maximumNumberOfDays = 365;
+const user = "magicmirror";
+const pass = "MyStrongPass";
+const auth = {
 	user: user,
 	pass: pass
 };
 
 console.log("Create fetcher ...");
 
-fetcher = new CalendarFetcher(url, fetchInterval, maximumEntries, maximumNumberOfDays, auth);
+const fetcher = new CalendarFetcher(url, fetchInterval, [], maximumEntries, maximumNumberOfDays, auth);
 
-fetcher.onReceive(function(fetcher) {
+fetcher.onReceive(function (fetcher) {
 	console.log(fetcher.events());
 	console.log("------------------------------------------------------------");
 });
 
-fetcher.onError(function(fetcher, error) {
+fetcher.onError(function (fetcher, error) {
 	console.log("Fetcher error:");
 	console.log(error);
 });
 
 fetcher.startFetch();
 
-console.log("Create fetcher done! ");
+console.log("Create fetcher done! ");

modules/default/calendar/node_helper.js

@@ -1,30 +1,26 @@
 /* Magic Mirror
  * Node Helper: Calendar
  *
- * By Michael Teeuw http://michaelteeuw.nl
+ * By Michael Teeuw https://michaelteeuw.nl
  * MIT Licensed.
  */
 
-var NodeHelper = require("node_helper");
-var validUrl = require("valid-url");
-var CalendarFetcher = require("./calendarfetcher.js");
+const NodeHelper = require("node_helper");
+const validUrl = require("valid-url");
+const CalendarFetcher = require("./calendarfetcher.js");
+const Log = require("../../../js/logger");
 
 module.exports = NodeHelper.create({
 	// Override start method.
-	start: function() {
-		var events = [];
-
+	start: function () {
+		Log.log("Starting node helper for: " + this.name);
 		this.fetchers = [];
-
-		console.log("Starting node helper for: " + this.name);
-
 	},
 
 	// Override socketNotificationReceived method.
-	socketNotificationReceived: function(notification, payload) {
+	socketNotificationReceived: function (notification, payload) {
 		if (notification === "ADD_CALENDAR") {
-			//console.log('ADD_CALENDAR: ');
-			this.createFetcher(payload.url, payload.fetchInterval, payload.excludedEvents, payload.maximumEntries, payload.maximumNumberOfDays, payload.auth);
+			this.createFetcher(payload.url, payload.fetchInterval, payload.excludedEvents, payload.maximumNumberOfDays, payload.auth, payload.broadcastPastEvents, payload.id);
 		}
 	},
 
@@ -35,41 +31,40 @@ module.exports = NodeHelper.create({
 	 * attribute url string - URL of the news feed.
 	 * attribute reloadInterval number - Reload interval in milliseconds.
 	 */
-
-	createFetcher: function(url, fetchInterval, excludedEvents, maximumEntries, maximumNumberOfDays, auth) {
+	createFetcher: function (url, fetchInterval, excludedEvents, maximumNumberOfDays, auth, broadcastPastEvents, identifier) {
 		var self = this;
 
 		if (!validUrl.isUri(url)) {
-			self.sendSocketNotification("INCORRECT_URL", {url: url});
+			self.sendSocketNotification("INCORRECT_URL", { id: identifier, url: url });
 			return;
 		}
 
 		var fetcher;
-		if (typeof self.fetchers[url] === "undefined") {
-			console.log("Create new calendar fetcher for url: " + url + " - Interval: " + fetchInterval);
-			fetcher = new CalendarFetcher(url, fetchInterval, excludedEvents, maximumEntries, maximumNumberOfDays, auth);
-
-			fetcher.onReceive(function(fetcher) {
-				//console.log('Broadcast events.');
-				//console.log(fetcher.events());
+		if (typeof self.fetchers[identifier + url] === "undefined") {
+			Log.log("Create new calendar fetcher for url: " + url + " - Interval: " + fetchInterval);
+			fetcher = new CalendarFetcher(url, fetchInterval, excludedEvents, maximumNumberOfDays, auth, broadcastPastEvents);
 
+			fetcher.onReceive(function (fetcher) {
 				self.sendSocketNotification("CALENDAR_EVENTS", {
+					id: identifier,
 					url: fetcher.url(),
 					events: fetcher.events()
 				});
 			});
 
-			fetcher.onError(function(fetcher, error) {
+			fetcher.onError(function (fetcher, error) {
+				Log.error("Calendar Error. Could not fetch calendar: ", fetcher.url(), error);
 				self.sendSocketNotification("FETCH_ERROR", {
+					id: identifier,
 					url: fetcher.url(),
 					error: error
 				});
 			});
 
-			self.fetchers[url] = fetcher;
+			self.fetchers[identifier + url] = fetcher;
 		} else {
-			//console.log('Use existing news fetcher for url: ' + url);
-			fetcher = self.fetchers[url];
+			Log.log("Use existing calendar fetcher for url: " + url);
+			fetcher = self.fetchers[identifier + url];
 			fetcher.broadcastEvents();
 		}
 

modules/default/calendar/vendor/ical.js/.travis.yml

@@ -1,6 +0,0 @@
-language: node_js
-node_js:
-    - "0.10"
-    - "0.12"
-    - "4.2"
-install: npm install 

modules/default/calendar/vendor/ical.js/LICENSE

@@ -1,178 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-

modules/default/calendar/vendor/ical.js/NOTICE

@@ -1,13 +0,0 @@
-Copyright 2012 Peter Braden
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.

modules/default/calendar/vendor/ical.js/example.js

@@ -1,13 +0,0 @@
-var ical = require('ical')
-  , months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
-
-
-ical.fromURL('http://lanyrd.com/topics/nodejs/nodejs.ics', {}, function(err, data){
-  for (var k in data){
-    if (data.hasOwnProperty(k)){
-      var ev = data[k]
-      console.log("Conference", ev.summary, 'is in',  ev.location, 'on the', ev.start.getDate(), 'of', months[ev.start.getMonth()] );
-    }
-  }
-})
-

modules/default/calendar/vendor/ical.js/ical.js

@@ -1,319 +0,0 @@
-(function(name, definition) {
-
-/****************
- *  A tolerant, minimal icalendar parser
- *  (http://tools.ietf.org/html/rfc5545)
- *
- *  <peterbraden@peterbraden.co.uk>
- * **************/
-
-  if (typeof module !== 'undefined') {
-    module.exports = definition();
-  } else if (typeof define === 'function' && typeof define.amd === 'object'){
-    define(definition);
-  } else {
-    this[name] = definition();
-  }
-
-}('ical', function(){
-
-   // Unescape Text re RFC 4.3.11
-  var text = function(t){
-    t = t || "";
-    return (t
-      .replace(/\\\,/g, ',')
-      .replace(/\\\;/g, ';')
-      .replace(/\\[nN]/g, '\n')
-      .replace(/\\\\/g, '\\')
-    )
-  }
-
-  var parseParams = function(p){
-    var out = {}
-    for (var i = 0; i<p.length; i++){
-      if (p[i].indexOf('=') > -1){
-        var segs = p[i].split('=');
-        
-        out[segs[0]] = parseValue(segs.slice(1).join('='));
-        
-      }
-    }
-    return out || sp
-  }
-
-  var parseValue = function(val){
-    if ('TRUE' === val)
-      return true;
-    
-    if ('FALSE' === val)
-      return false;
-
-    var number = Number(val);
-    if (!isNaN(number))
-      return number;
-
-    return val;
-  }
-
-  var storeParam = function(name){
-    return function(val, params, curr){
-      var data;
-      if (params && params.length && !(params.length==1 && params[0]==='CHARSET=utf-8')){
-        data = {params:parseParams(params), val:text(val)}
-      }
-      else
-        data = text(val)
-
-      var current = curr[name];
-      if (Array.isArray(current)){
-        current.push(data);
-        return curr;
-      }
-
-      if (current != null){
-        curr[name] = [current, data];
-        return curr;
-      }
-
-      curr[name] = data;
-      return curr
-    }
-  }
-
-  var addTZ = function(dt, name, params){
-    var p = parseParams(params);
-
-    if (params && p){
-      dt[name].tz = p.TZID
-    }
-
-    return dt
-  }
-
-  var dateParam = function(name){
-    return function(val, params, curr){
-
-      // Store as string - worst case scenario
-      storeParam(name)(val, undefined, curr)
-
-      if (params && params[0] === "VALUE=DATE") {
-        // Just Date
-
-        var comps = /^(\d{4})(\d{2})(\d{2})$/.exec(val);
-        if (comps !== null) {
-          // No TZ info - assume same timezone as this computer
-          curr[name] = new Date(
-            comps[1],
-            parseInt(comps[2], 10)-1,
-            comps[3]
-          );
-
-          return addTZ(curr, name, params);
-        }
-      }
-
-
-      //typical RFC date-time format
-      var comps = /^(\d{4})(\d{2})(\d{2})T(\d{2})(\d{2})(\d{2})(Z)?$/.exec(val);
-      if (comps !== null) {
-        if (comps[7] == 'Z'){ // GMT
-          curr[name] = new Date(Date.UTC(
-            parseInt(comps[1], 10),
-            parseInt(comps[2], 10)-1,
-            parseInt(comps[3], 10),
-            parseInt(comps[4], 10),
-            parseInt(comps[5], 10),
-            parseInt(comps[6], 10 )
-          ));
-          // TODO add tz
-        } else {
-          curr[name] = new Date(
-            parseInt(comps[1], 10),
-            parseInt(comps[2], 10)-1,
-            parseInt(comps[3], 10),
-            parseInt(comps[4], 10),
-            parseInt(comps[5], 10),
-            parseInt(comps[6], 10)
-          );
-        }
-      }
-
-      return addTZ(curr, name, params)
-    }
-  }
-
-  var exdateParam = function(name){
-    return function(val, params, curr){
-      var date = dateParam(name)(val, params, curr);
-      if (date.exdates === undefined) {
-        date.exdates = [];
-      }
-      date.exdates.push(date.exdate);
-      return date;
-    }
-  }
-
-  var geoParam = function(name){
-    return function(val, params, curr){
-      storeParam(val, params, curr)
-      var parts = val.split(';');
-      curr[name] = {lat:Number(parts[0]), lon:Number(parts[1])};
-      return curr
-    }
-  }
-
-  var categoriesParam = function (name) {
-    var separatorPattern = /\s*,\s*/g;
-    return function (val, params, curr) {
-      storeParam(val, params, curr)
-      if (curr[name] === undefined)
-        curr[name] = val ? val.split(separatorPattern) : []
-      else
-        if (val)
-          curr[name] = curr[name].concat(val.split(separatorPattern))
-      return curr
-    }
-  }
-
-  var addFBType = function(fb, params){
-    var p = parseParams(params);
-
-    if (params && p){
-      fb.type = p.FBTYPE || "BUSY"
-    }
-
-    return fb;
-  }
-
-  var freebusyParam = function (name) {
-    return function(val, params, curr){
-      var fb = addFBType({}, params);
-      curr[name] = curr[name] || []
-      curr[name].push(fb);
-
-      storeParam(val, params, fb);
-
-      var parts = val.split('/');
-
-      ['start', 'end'].forEach(function (name, index) {
-        dateParam(name)(parts[index], params, fb);
-      });
-
-      return curr;
-    }
-  }
-
-  return {
-
-
-    objectHandlers : {
-      'BEGIN' : function(component, params, curr, stack){
-          stack.push(curr)
-
-          return {type:component, params:params}
-        }
-
-      , 'END' : function(component, params, curr, stack){
-        // prevents the need to search the root of the tree for the VCALENDAR object
-        if (component === "VCALENDAR") {
-            //scan all high level object in curr and drop all strings
-            var key,
-                obj;
-            
-            for (key in curr) {
-                if(curr.hasOwnProperty(key)) {
-                   obj = curr[key];
-                   if (typeof obj === 'string') {
-                       delete curr[key];
-                   }
-                }
-            }
-            
-            return curr
-        }
-        
-        var par = stack.pop()
-
-        if (curr.uid)
-          par[curr.uid] = curr
-        else
-          par[Math.random()*100000] = curr  // Randomly assign ID : TODO - use true GUID
-
-        return par
-      }
-
-      , 'SUMMARY' : storeParam('summary')
-      , 'DESCRIPTION' : storeParam('description')
-      , 'URL' : storeParam('url')
-      , 'UID' : storeParam('uid')
-      , 'LOCATION' : storeParam('location')
-      , 'DTSTART' : dateParam('start')
-      , 'DTEND' : dateParam('end')
-      , 'EXDATE' : exdateParam('exdate')
-      ,' CLASS' : storeParam('class')
-      , 'TRANSP' : storeParam('transparency')
-      , 'GEO' : geoParam('geo')
-      , 'PERCENT-COMPLETE': storeParam('completion')
-      , 'COMPLETED': dateParam('completed')
-      , 'CATEGORIES': categoriesParam('categories')
-      , 'FREEBUSY': freebusyParam('freebusy')
-    },
-
-
-    handleObject : function(name, val, params, ctx, stack, line){
-      var self = this
-
-      if(self.objectHandlers[name])
-        return self.objectHandlers[name](val, params, ctx, stack, line)
-
-      //handling custom properties
-      if(name.match(/X\-[\w\-]+/) && stack.length > 0) {
-          //trimming the leading and perform storeParam
-          name = name.substring(2);
-          return (storeParam(name))(val, params, ctx, stack, line);
-      }
-      
-      return storeParam(name.toLowerCase())(val, params, ctx);
-    },
-
-
-    parseICS : function(str){
-      var self = this
-      var lines = str.split(/\r?\n/)
-      var ctx = {}
-      var stack = []
-
-      for (var i = 0, ii = lines.length, l = lines[0]; i<ii; i++, l=lines[i]){
-        //Unfold : RFC#3.1
-        while (lines[i+1] && /[ \t]/.test(lines[i+1][0])) {
-          l += lines[i+1].slice(1)
-          i += 1
-        }
-
-        var kv = l.split(":")
-
-        if (kv.length < 2){
-          // Invalid line - must have k&v
-          continue;
-        }
-
-        // Although the spec says that vals with colons should be quote wrapped
-        // in practise nobody does, so we assume further colons are part of the
-        // val
-        var value = kv.slice(1).join(":")
-          , kp = kv[0].split(";")
-          , name = kp[0]
-          , params = kp.slice(1)
-
-        ctx = self.handleObject(name, value, params, ctx, stack, l) || {}
-      }
-
-       // type and params are added to the list of items, get rid of them.
-       delete ctx.type
-       delete ctx.params
-
-       return ctx
-    }
-
-  }
-}))

modules/default/calendar/vendor/ical.js/index.js

@@ -1,8 +0,0 @@
-module.exports = require('./ical')
-
-var node = require('./node-ical')
-
-// Copy node functions across to exports
-for (var i in node){
-  module.exports[i] = node[i]
-}  

modules/default/calendar/vendor/ical.js/node-ical.js

@@ -1,50 +0,0 @@
-var ical = require('./ical')
-  , request = require('request')
-  , fs = require('fs')
-
-exports.fromURL = function(url, opts, cb){
-  if (!cb)
-    return;
-  request(url, opts, function(err, r, data){
-    if (err)
-      return cb(err, null);
-    cb(undefined, ical.parseICS(data));
-  })
-}
-
-exports.parseFile = function(filename){
-  return ical.parseICS(fs.readFileSync(filename, 'utf8'))
-}
-
-
-var rrule = require('rrule-alt').RRule
-var rrulestr = rrule.rrulestr
-
-ical.objectHandlers['RRULE'] = function(val, params, curr, stack, line){
-  curr.rrule = line;
-  return curr
-}
-var originalEnd = ical.objectHandlers['END'];
-ical.objectHandlers['END'] = function(val, params, curr, stack){
-  if (curr.rrule) {
-    var rule = curr.rrule;
-    if (rule.indexOf('DTSTART') === -1) {
-
-      if (curr.start.length === 8) {
-        var comps = /^(\d{4})(\d{2})(\d{2})$/.exec(curr.start);
-        if (comps) {
-         curr.start = new Date (comps[1], comps[2] - 1, comps[3]);
-        }
-      }
-
-      rule += ' DTSTART:' + curr.start.toISOString().replace(/[-:]/g, '');
-      rule = rule.replace(/\.[0-9]{3}/, '');
-    }
-    for (var i in curr.exdates) {
-      rule += ' EXDATE:' + curr.exdates[i].toISOString().replace(/[-:]/g, '');
-      rule = rule.replace(/\.[0-9]{3}/, '');
-    }
-    curr.rrule = rrulestr(rule);
-  }
-  return originalEnd.call(this, val, params, curr, stack);
-}

modules/default/calendar/vendor/ical.js/package.json

@@ -1,28 +0,0 @@
-{
-  "name": "ical",
-  "version": "0.5.0",
-  "main": "index.js",
-  "description": "A tolerant, minimal icalendar parser",
-  "keywords": [
-    "ical",
-    "ics",
-    "calendar"
-  ],
-  "homepage": "https://github.com/peterbraden/ical.js",
-  "author": "Peter Braden <peterbraden@peterbraden.co.uk> (peterbraden.co.uk)",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/peterbraden/ical.js.git"
-  },
-  "dependencies": {
-    "request": "2.68.0",
-    "rrule": "2.0.0"
-  },
-  "devDependencies": {
-    "vows": "0.7.0",
-    "underscore": "1.3.0"
-  },
-  "scripts": {
-    "test": "./node_modules/vows/bin/vows ./test/test.js"
-  }
-}

modules/default/calendar/vendor/ical.js/readme.md

@@ -1,51 +0,0 @@
-# ical.js #
-(Formerly node-ical)
-
-[![Build Status](https://travis-ci.org/peterbraden/ical.js.png)](https://travis-ci.org/peterbraden/ical.js)
-
-A tolerant, minimal icalendar parser for javascript/node
-(http://tools.ietf.org/html/rfc5545)
-
-
-## Install - Node.js ##
-
-ical.js is availble on npm:
-
-    npm install ical
-
-
-
-## API ##
-
-    ical.parseICS(str)
-
-Parses a string with an ICS File
-
-    var data = ical.parseFile(filename)
-    
-Reads in the specified iCal file, parses it and returns the parsed data
-
-    ical.fromURL(url, options, function(err, data) {} )
-
-Use the request library to fetch the specified URL (```opts``` gets passed on to the ```request()``` call), and call the function with the result (either an error or the data).
-
-
-
-## Example 1 - Print list of upcoming node conferences (see example.js)
-```javascript
-    var ical = require('ical')
-  , months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
-
-    ical.fromURL('http://lanyrd.com/topics/nodejs/nodejs.ics', {}, function(err, data) {
-      for (var k in data){
-        if (data.hasOwnProperty(k)) {
-          var ev = data[k]
-          console.log("Conference",
-            ev.summary,
-            'is in',
-            ev.location,
-            'on the', ev.start.getDate(), 'of', months[ev.start.getMonth()]);
-        }
-      }
-    });
-```

modules/default/calendar/vendor/ical.js/test/test.js

@@ -1,393 +0,0 @@
-/****
- * Tests
- *
- *
- ***/
-process.env.TZ = 'America/San_Francisco';
-var ical = require('../index')
-
-var vows = require('vows')
-  , assert = require('assert')
-  , _ = require('underscore')
-
-vows.describe('node-ical').addBatch({
-  'when parsing test1.ics (node conferences schedule from lanyrd.com, modified)': {
-        topic: function () {
-      return ical.parseFile('./test/test1.ics')
-    }
-
-    ,'we get 9 events': function (topic) {
-      var events = _.select(_.values(topic), function(x){ return x.type==='VEVENT'})
-            assert.equal (events.length, 9);
-        }
-
-    ,'event 47f6e' : {
-      topic: function(events){
-        return _.select(_.values(events),
-          function(x){
-            return x.uid ==='47f6ea3f28af2986a2192fa39a91fa7d60d26b76'})[0]
-      }
-      ,'is in fort lauderdale' : function(topic){
-        assert.equal(topic.location, "Fort Lauderdale, United States")
-      }
-      ,'starts Tue, 29 Nov 2011' : function(topic){
-        assert.equal(topic.start.toDateString(), new Date(2011,10,29).toDateString())
-      }
-    }
-    , 'event 480a' : {
-      topic: function(events){
-        return _.select(_.values(events),
-          function(x){
-            return x.uid ==='480a3ad48af5ed8965241f14920f90524f533c18'})[0]
-      }
-      , 'has a summary (invalid colon handling tolerance)' : function(topic){
-        assert.equal(topic.summary, '[Async]: Everything Express')
-      }
-    }
-    , 'event d4c8' :{
-      topic : function(events){
-        return _.select(_.values(events),
-            function(x){
-              return x.uid === 'd4c826dfb701f611416d69b4df81caf9ff80b03a'})[0]
-      }
-      , 'has a start datetime' : function(topic){
-        assert.equal(topic.start.toDateString(), new Date(Date.UTC(2011, 2, 12, 20, 0, 0)).toDateString())
-      }
-    }
-
-    , 'event sdfkf09fsd0 (Invalid Date)' :{
-      topic : function(events){
-        return _.select(_.values(events),
-            function(x){
-              return x.uid === 'sdfkf09fsd0'})[0]
-      }
-       , 'has a start datetime' : function(topic){
-          assert.equal(topic.start, "Next Year")
-        }
-    }
-  }
-  , 'with test2.ics (testing ical features)' : {
-    topic: function () {
-      return ical.parseFile('./test/test2.ics')
-    }
-    , 'todo item uid4@host1.com' : {
-      topic : function(items){
-        return items['uid4@host1.com']
-      }
-      , 'is a VTODO' : function(topic){
-        assert.equal(topic.type, 'VTODO')
-      }
-    }
-    , 'vfreebusy' : {
-      topic: function(events) {
-        return _.select(_.values(events), function(x) {
-          return x.type === 'VFREEBUSY';
-        })[0];
-      }
-      , 'has a URL' : function(topic) {
-        assert.equal(topic.url, 'http://www.host.com/calendar/busytime/jsmith.ifb');
-      }
-    }
-    , 'vfreebusy first freebusy' : {
-      topic: function(events) {
-        return _.select(_.values(events), function(x) {
-          return x.type === 'VFREEBUSY';
-        })[0].freebusy[0];
-      }
-      , 'has undefined type defaulting to busy' : function(topic) {
-        assert.equal(topic.type, "BUSY");
-      }
-      , 'has an start datetime' : function(topic) {
-        assert.equal(topic.start.getFullYear(), 1998);
-        assert.equal(topic.start.getUTCMonth(), 2);
-        assert.equal(topic.start.getUTCDate(), 14);
-        assert.equal(topic.start.getUTCHours(), 23);
-        assert.equal(topic.start.getUTCMinutes(), 30);
-      }
-      , 'has an end datetime' : function(topic) {
-        assert.equal(topic.end.getFullYear(), 1998);
-        assert.equal(topic.end.getUTCMonth(), 2);
-        assert.equal(topic.end.getUTCDate(), 15);
-        assert.equal(topic.end.getUTCHours(), 00);
-        assert.equal(topic.end.getUTCMinutes(), 30);
-      }
-    }
-  }
-  , 'with test3.ics (testing tvcountdown.com)' : {
-    topic: function() {
-      return ical.parseFile('./test/test3.ics');
-    }
-    , 'event -83' : {
-      topic: function(events) {
-        return _.select(_.values(events), function(x) {
-          return x.uid === '20110505T220000Z-83@tvcountdown.com';
-        })[0];
-      }
-      , 'has a start datetime' : function(topic) {
-        assert.equal(topic.start.getFullYear(), 2011);
-        assert.equal(topic.start.getMonth(), 4);
-      }
-      , 'has an end datetime' : function(topic) {
-        assert.equal(topic.end.getFullYear(), 2011);
-        assert.equal(topic.end.getMonth(), 4);
-      }
-    }
-  }
-
-  , 'with test4.ics (testing tripit.com)' : {
-    topic: function() {
-      return ical.parseFile('./test/test4.ics');
-    }
-    , 'event c32a5...' : {
-      topic: function(events) {
-        return _.select(_.values(events), function(x) {
-          return x.uid === 'c32a5eaba2354bb29e012ec18da827db90550a3b@tripit.com';
-        })[0];
-      }
-      , 'has a start datetime' : function(topic) {
-        assert.equal(topic.start.getFullYear(), 2011);
-        assert.equal(topic.start.getMonth(), 09);
-        assert.equal(topic.start.getDate(), 11);
-      }
-
-      , 'has a summary' : function(topic){
-        // escaped commas and semicolons should be replaced
-        assert.equal(topic.summary, 'South San Francisco, CA, October 2011;')
-
-      }
-
-      , 'has a description' : function(topic){
-        var desired = 'John Doe is in South San Francisco, CA from Oct 11 ' +
-         'to Oct 13, 2011\nView and/or edit details in TripIt : http://www.tripit.c' +
-         'om/trip/show/id/23710889\nTripIt - organize your travel at http://www.trip' +
-         'it.com\n'
-        assert.equal(topic.description, desired)
-
-      }
-
-      , 'has a geolocation' : function(topic){
-        assert.ok(topic.geo, 'no geo param')
-        assert.equal(topic.geo.lat, 37.654656)
-        assert.equal(topic.geo.lon, -122.40775)
-      }
-
-      , 'has transparency' : function(topic){
-        assert.equal(topic.transparency, 'TRANSPARENT')
-      }
-
-    }
-  }
-
-
-
-  , 'with test5.ics (testing meetup.com)' : {
-     topic: function () {
-        return ical.parseFile('./test/test5.ics')
-      }
-    , 'event nsmxnyppbfc@meetup.com' : {
-      topic: function(events) {
-        return _.select(_.values(events), function(x) {
-          return x.uid === 'event_nsmxnyppbfc@meetup.com';
-        })[0];
-      }
-      , 'has a start' : function(topic){
-        assert.equal(topic.start.tz, 'America/Phoenix')
-        assert.equal(topic.start.toISOString(), new Date(2011, 10, 09, 19, 0,0).toISOString())
-      }
-    }
-  }
-
-  , 'with test6.ics (testing assembly.org)' : {
-     topic: function () {
-        return ical.parseFile('./test/test6.ics')
-      }
-    , 'event with no ID' : {
-      topic: function(events) {
-        return _.select(_.values(events), function(x) {
-          return x.summary === 'foobar Summer 2011 starts!';
-        })[0];
-      }
-      , 'has a start' : function(topic){
-        assert.equal(topic.start.toISOString(), new Date(2011, 07, 04, 12, 0,0).toISOString())
-      }
-    }
-  , 'event with rrule' :{
-      topic: function(events){
-        return _.select(_.values(events), function(x){
-          return x.summary == "foobarTV broadcast starts"
-        })[0];
-      }
-      , "Has an RRULE": function(topic){
-        assert.notEqual(topic.rrule, undefined);
-      }
-      , "RRule text": function(topic){
-        assert.equal(topic.rrule.toText(), "every 5 weeks on Monday, Friday until January 30, 2013")
-      }
-    }
-  }
-   , 'with test7.ics (testing dtstart of rrule)' :{
-    topic: function() {
-        return ical.parseFile('./test/test7.ics');
-    },
-    'recurring yearly event (14 july)': {
-        topic: function(events){
-            var ev = _.values(events)[0];
-            return ev.rrule.between(new Date(2013, 0, 1), new Date(2014, 0, 1));
-        },
-        'dt start well set': function(topic) {
-            assert.equal(topic[0].toDateString(), new Date(2013, 6, 14).toDateString());
-        }
-    }
-  }
-  , "with test 8.ics (VTODO completion)": {
-    topic: function() {
-        return ical.parseFile('./test/test8.ics');
-    },
-    'grabbing VTODO task': {
-        topic: function(topic) {
-            return _.values(topic)[0];
-        },
-        'task completed': function(task){
-            assert.equal(task.completion, 100);
-            assert.equal(task.completed.toISOString(), new Date(2013, 06, 16, 10, 57, 45).toISOString());
-        }
-    }
-  }
-  , "with test 9.ics (VEVENT with VALARM)": {
-    topic: function() {
-        return ical.parseFile('./test/test9.ics');
-    },
-    'grabbing VEVENT task': {
-        topic: function(topic) {
-            return _.values(topic)[0];
-        },
-        'task completed': function(task){
-            assert.equal(task.summary, "Event with an alarm");
-        }
-    }
-  }
-  , 'with test 11.ics (VEVENT with custom properties)': {
-      topic: function() {
-          return ical.parseFile('./test10.ics');
-      },
-      'grabbing custom properties': {
-          topic: function(topic) {
-              
-          }
-      }
-  },
-
-  'with test10.ics': {
-    topic: function () {
-      return ical.parseFile('./test/test10.ics');
-    },
-
-    'when categories present': {
-      topic: function (t) {return _.values(t)[0]},
-
-      'should be a list': function (e) {
-        assert(e.categories instanceof [].constructor);
-      },
-
-      'should contain individual category values': function (e) {
-        assert.deepEqual(e.categories, ['cat1', 'cat2', 'cat3']);
-      }
-    },
-
-    'when categories present with trailing whitespace': {
-      topic: function (t) {return _.values(t)[1]},
-
-      'should contain individual category values without whitespace': function (e) {
-        assert.deepEqual(e.categories, ['cat1', 'cat2', 'cat3']);
-      }
-    },
-
-    'when categories present but empty': {
-      topic: function (t) {return _.values(t)[2]},
-
-      'should be an empty list': function (e) {
-        assert.deepEqual(e.categories, []);
-      }
-    },
-
-    'when categories present but singular': {
-      topic: function (t) {return _.values(t)[3]},
-
-      'should be a list of single item': function (e) {
-        assert.deepEqual(e.categories, ['lonely-cat']);
-      }
-    },
-
-    'when categories present on multiple lines': {
-      topic: function (t) {return _.values(t)[4]},
-
-      'should contain the category values in an array': function (e) {
-        assert.deepEqual(e.categories, ['cat1', 'cat2', 'cat3']);
-      }
-    }
-  },
-
-  'with test11.ics (testing zimbra freebusy)': {
-    topic: function () {
-      return ical.parseFile('./test/test11.ics');
-    },
-
-    'freebusy params' : {
-      topic: function(events) {
-        return _.values(events)[0];
-      }
-      , 'has a URL' : function(topic) {
-        assert.equal(topic.url, 'http://mail.example.com/yvr-2a@example.com/20140416');
-      }
-      , 'has an ORGANIZER' : function(topic) {
-        assert.equal(topic.organizer, 'mailto:yvr-2a@example.com');
-      }
-      , 'has an start datetime' : function(topic) {
-        assert.equal(topic.start.getFullYear(), 2014);
-        assert.equal(topic.start.getMonth(), 3);
-      }
-      , 'has an end datetime' : function(topic) {
-        assert.equal(topic.end.getFullYear(), 2014);
-        assert.equal(topic.end.getMonth(), 6);
-      }
-    }
-    , 'freebusy busy events' : {
-      topic: function(events) {
-        return _.select(_.values(events)[0].freebusy, function(x) {
-          return x.type === 'BUSY';
-        })[0];
-      }
-      , 'has an start datetime' : function(topic) {
-        assert.equal(topic.start.getFullYear(), 2014);
-        assert.equal(topic.start.getMonth(), 3);
-        assert.equal(topic.start.getUTCHours(), 15);
-        assert.equal(topic.start.getUTCMinutes(), 15);
-      }
-      , 'has an end datetime' : function(topic) {
-        assert.equal(topic.end.getFullYear(), 2014);
-        assert.equal(topic.end.getMonth(), 3);
-        assert.equal(topic.end.getUTCHours(), 19);
-        assert.equal(topic.end.getUTCMinutes(), 00);
-      }
-    }
-  },
-
-  'url request errors' : {
-    topic : function () {
-      ical.fromURL('http://not.exist/', {}, this.callback);
-    }
-    , 'are passed back to the callback' : function (err, result) {
-      assert.instanceOf(err, Error);
-      if (!err){
-        console.log(">E:", err, result)
-      }
-    }
-  }
-}).export(module)
-
-
-//ical.fromURL('http://lanyrd.com/topics/nodejs/nodejs.ics',
-//  {},
-//  function(err, data){
-//    console.log("OUT:", data)
-//  })

modules/default/calendar/vendor/ical.js/test/test1.ics

@@ -1,78 +0,0 @@
-BEGIN:VCALENDAR
-PRODID:-//lanyrd.com//Lanyrd//EN
-X-ORIGINAL-URL:http://lanyrd.com/topics/nodejs/nodejs.ics
-X-WR-CALNAME;CHARSET=utf-8:Node.js conferences
-VERSION:2.0
-METHOD:PUBLISH
-BEGIN:VEVENT
-SUMMARY;CHARSET=utf-8:Dyncon 2011
-LOCATION;CHARSET=utf-8:Stockholm, Sweden
-URL:http://lanyrd.com/2011/dyncon/
-UID:d4c826dfb701f611416d69b4df81caf9ff80b03a
-DTSTART:20110312T200000Z
-DTEND;VALUE=DATE:20110314
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY;CHARSET=utf-8:[Async]: Everything Express
-LOCATION;CHARSET=utf-8:Brighton, United Kingdom
-URL:http://lanyrd.com/2011/asyncjs-express/
-UID:480a3ad48af5ed8965241f14920f90524f533c18
-DTSTART;VALUE=DATE:20110324
-DTEND;VALUE=DATE:20110325
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY;CHARSET=utf-8:JSConf US 2011
-LOCATION;CHARSET=utf-8:Portland, United States
-URL:http://lanyrd.com/2011/jsconf/
-UID:ed334cc85db5ebdff5ff5a630a7a48631a677dbe
-DTSTART;VALUE=DATE:20110502
-DTEND;VALUE=DATE:20110504
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY;CHARSET=utf-8:NodeConf 2011
-LOCATION;CHARSET=utf-8:Portland, United States
-URL:http://lanyrd.com/2011/nodeconf/
-UID:25169a7b1ba5c248278f47120a40878055dc8c15
-DTSTART;VALUE=DATE:20110505
-DTEND;VALUE=DATE:20110506
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY;CHARSET=utf-8:BrazilJS
-LOCATION;CHARSET=utf-8:Fortaleza, Brazil
-URL:http://lanyrd.com/2011/braziljs/
-UID:dafee3be83624f3388c5635662229ff11766bb9c
-DTSTART;VALUE=DATE:20110513
-DTEND;VALUE=DATE:20110515
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY;CHARSET=utf-8:Falsy Values
-LOCATION;CHARSET=utf-8:Warsaw, Poland
-URL:http://lanyrd.com/2011/falsy-values/
-UID:73cad6a09ac4e7310979c6130f871d17d990b5ad
-DTSTART;VALUE=DATE:20110518
-DTEND;VALUE=DATE:20110521
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY;CHARSET=utf-8:nodecamp.eu
-LOCATION;CHARSET=utf-8:Cologne, Germany
-URL:http://lanyrd.com/2011/nodecampde/
-UID:b728a5fdb5f292b6293e4a2fd97a1ccfc69e9d6f
-DTSTART;VALUE=DATE:20110611
-DTEND;VALUE=DATE:20110613
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY;CHARSET=utf-8:Rich Web Experience 2011
-LOCATION;CHARSET=utf-8:Fort Lauderdale, United States
-URL:http://lanyrd.com/2011/rich-web-experience/
-UID:47f6ea3f28af2986a2192fa39a91fa7d60d26b76
-DTSTART;VALUE=DATE:20111129
-DTEND;VALUE=DATE:20111203
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY;CHARSET=utf-8:Foobar
-UID:sdfkf09fsd0
-DTSTART;VALUE=DATE:Next Year
-DTEND;VALUE=DATE:20111203
-END:VEVENT
-
-END:VCALENDAR

modules/default/calendar/vendor/ical.js/test/test10.ics

@@ -1,34 +0,0 @@
-BEGIN:VCALENDAR
-BEGIN:VEVENT
-UID:1
-SUMMARY:Event with a category
-DESCRIPTION:Details for an event with a category
-CATEGORIES:cat1,cat2,cat3
-END:VEVENT
-BEGIN:VEVENT
-UID:2
-SUMMARY:Event with a category
-DESCRIPTION:Details for an event with a category
-CATEGORIES:cat1  ,  cat2,   cat3
-END:VEVENT
-BEGIN:VEVENT
-UID:3
-SUMMARY:Event with a category
-DESCRIPTION:Details for an event with a category
-CATEGORIES:
-END:VEVENT
-BEGIN:VEVENT
-UID:4
-SUMMARY:Event with a category
-DESCRIPTION:Details for an event with a category
-CATEGORIES:lonely-cat
-END:VEVENT
-BEGIN:VEVENT
-UID:5
-SUMMARY:Event with a category
-DESCRIPTION:Details for an event with a category
-CATEGORIES:cat1
-CATEGORIES:cat2
-CATEGORIES:cat3
-END:VEVENT
-END:VCALENDAR

modules/default/calendar/vendor/ical.js/test/test11.ics

@@ -1,41 +0,0 @@
-BEGIN:VCALENDAR
-PRODID:Zimbra-Calendar-Provider
-VERSION:2.0
-METHOD:PUBLISH
-BEGIN:VFREEBUSY
-ORGANIZER:mailto:yvr-2a@example.com
-DTSTAMP:20140516T235436Z
-DTSTART:20140415T235436Z
-DTEND:20140717T235436Z
-URL:http://mail.example.com/yvr-2a@example.com/20140416
-FREEBUSY;FBTYPE=BUSY:20140416T151500Z/20140416T190000Z
-FREEBUSY;FBTYPE=BUSY:20140416T195500Z/20140416T231500Z
-FREEBUSY;FBTYPE=BUSY:20140417T193000Z/20140417T203000Z
-FREEBUSY;FBTYPE=BUSY:20140421T210000Z/20140421T213000Z
-FREEBUSY;FBTYPE=BUSY:20140423T180000Z/20140423T190000Z
-FREEBUSY;FBTYPE=BUSY:20140423T200000Z/20140423T210000Z
-FREEBUSY;FBTYPE=BUSY:20140423T223500Z/20140423T231500Z
-FREEBUSY;FBTYPE=BUSY:20140424T155000Z/20140424T165500Z
-FREEBUSY;FBTYPE=BUSY:20140424T170000Z/20140424T183000Z
-FREEBUSY;FBTYPE=BUSY:20140424T195000Z/20140424T230000Z
-FREEBUSY;FBTYPE=BUSY:20140425T144500Z/20140425T161500Z
-FREEBUSY;FBTYPE=BUSY:20140425T180000Z/20140425T194500Z
-FREEBUSY;FBTYPE=BUSY:20140425T223000Z/20140425T230000Z
-FREEBUSY;FBTYPE=BUSY:20140428T151500Z/20140428T163000Z
-FREEBUSY;FBTYPE=BUSY:20140428T170000Z/20140428T173000Z
-FREEBUSY;FBTYPE=BUSY:20140428T195500Z/20140428T213000Z
-FREEBUSY;FBTYPE=BUSY:20140428T231000Z/20140428T234000Z
-FREEBUSY;FBTYPE=BUSY:20140429T152500Z/20140429T170000Z
-FREEBUSY;FBTYPE=BUSY:20140429T180000Z/20140429T183000Z
-FREEBUSY;FBTYPE=BUSY:20140429T201500Z/20140429T230000Z
-FREEBUSY;FBTYPE=BUSY:20140430T162500Z/20140430T165500Z
-FREEBUSY;FBTYPE=BUSY:20140430T180000Z/20140430T190000Z
-FREEBUSY;FBTYPE=BUSY:20140501T170000Z/20140501T173000Z
-FREEBUSY;FBTYPE=BUSY:20140501T175000Z/20140501T190000Z
-FREEBUSY;FBTYPE=BUSY:20140501T232000Z/20140501T235000Z
-FREEBUSY;FBTYPE=BUSY:20140502T163500Z/20140502T173000Z
-FREEBUSY;FBTYPE=BUSY:20140505T165500Z/20140505T173000Z
-FREEBUSY;FBTYPE=BUSY:20140505T201500Z/20140505T203000Z
-FREEBUSY;FBTYPE=BUSY:20140505T210000Z/20140505T213000Z
-END:VFREEBUSY
-END:VCALENDAR

modules/default/calendar/vendor/ical.js/test/test2.ics

@@ -1,83 +0,0 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-X-WR-TIMEZONE;VALUE=TEXT:US/Pacific
-METHOD:PUBLISH
-PRODID:-//Apple Computer\, Inc//iCal 1.0//EN
-X-WR-CALNAME;VALUE=TEXT:Example
-VERSION:2.0
-BEGIN:VEVENT
-SEQUENCE:5
-DTSTART;TZID=US/Pacific:20021028T140000
-DTSTAMP:20021028T011706Z
-SUMMARY:Coffee with Jason
-UID:EC9439B1-FF65-11D6-9973-003065F99D04
-DTEND;TZID=US/Pacific:20021028T150000
-END:VEVENT
-BEGIN:VALARM
-TRIGGER;VALUE=DURATION:-P1D
-ACTION:DISPLAY
-DESCRIPTION:Event reminder
-END:VALARM
-BEGIN:VEVENT
-SEQUENCE:1
-DTSTAMP:20021128T012034Z
-SUMMARY:Code Review
-UID:EC944331-FF65-11D6-9973-003065F99D04
-DTSTART;TZID=US/Pacific:20021127T120000
-DURATION:PT1H
-END:VEVENT
-BEGIN:VEVENT
-SEQUENCE:1
-DTSTAMP:20021028T012034Z
-SUMMARY:Dinner with T
-UID:EC944CFA-FF65-11D6-9973-003065F99D04
-DTSTART;TZID=US/Pacific:20021216T200000
-DURATION:PT1H
-END:VEVENT
-BEGIN:VTODO
-DTSTAMP:19980130T134500Z
-SEQUENCE:2
-UID:uid4@host1.com
-ORGANIZER:MAILTO:unclesam@us.gov
-ATTENDEE;PARTSTAT=ACCEPTED:MAILTO:jqpublic@host.com
-DUE:19980415T235959
-STATUS:NEEDS-ACTION
-SUMMARY:Submit Income Taxes
-END:VTODO
-BEGIN:VALARM
-ACTION:AUDIO
-TRIGGER:19980403T120000
-ATTACH;FMTTYPE=audio/basic:http://host.com/pub/audio-
- files/ssbanner.aud
-REPEAT:4
-DURATION:PT1H
-END:VALARM
-BEGIN:VJOURNAL
-DTSTAMP:19970324T120000Z
-UID:uid5@host1.com
-ORGANIZER:MAILTO:jsmith@host.com
-STATUS:DRAFT
-CLASS:PUBLIC
-CATEGORY:Project Report, XYZ, Weekly Meeting
-DESCRIPTION:Project xyz Review Meeting Minutes\n
-  Agenda\n1. Review of project version 1.0 requirements.\n2.
- Definition
-  of project processes.\n3. Review of project schedule.\n
-  Participants: John Smith, Jane Doe, Jim Dandy\n-It was
-   decided that the requirements need to be signed off by
-   product marketing.\n-Project processes were accepted.\n
-  -Project schedule needs to account for scheduled holidays
-   and employee vacation time. Check with HR for specific
-   dates.\n-New schedule will be distributed by Friday.\n-
-  Next weeks meeting is cancelled. No meeting until 3/23.
-END:VJOURNAL
-BEGIN:VFREEBUSY
-ORGANIZER:MAILTO:jsmith@host.com
-DTSTART:19980313T141711Z
-DTEND:19980410T141711Z
-FREEBUSY:19980314T233000Z/19980315T003000Z
-FREEBUSY:19980316T153000Z/19980316T163000Z
-FREEBUSY:19980318T030000Z/19980318T040000Z
-URL:http://www.host.com/calendar/busytime/jsmith.ifb
-END:VFREEBUSY
-END:VCALENDAR

modules/default/calendar/vendor/ical.js/test/test3.ics

@@ -1,226 +0,0 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:tvcountdown.com
-X-WR-CALNAME:tvcountdown.com
-VERSION:2.0
-METHOD:PUBLISH
-X-WR-TIMEZONE:US/Eastern
-X-WR-CALNAME;VALUE=TEXT:tvcountdown.com
-X-WR-CALDESC:
-BEGIN:VEVENT
-UID:20110519T200000Z-79@tvcountdown.com
-DTSTART;VALUE=DATE-TIME:20110519T200000
-DTEND;VALUE=DATE-TIME:20110519T203000
-DTSTAMP:20110430T192946Z
-URL;VALUE=URI:
-SUMMARY:The Big Bang Theory - S04E24 - The Roomate Transmogrfication
-END:VEVENT
-BEGIN:VEVENT
-UID:20110512T200000Z-79@tvcountdown.com
-DTSTART;VALUE=DATE-TIME:20110512T200000
-DTEND;VALUE=DATE-TIME:20110512T203000
-DTSTAMP:20110430T192946Z
-URL;VALUE=URI:
-SUMMARY:The Big Bang Theory - S04E23 - The Engagement Reaction
-END:VEVENT
-BEGIN:VEVENT
-UID:20110505T220000Z-83@tvcountdown.com
-DTSTART;VALUE=DATE-TIME:20110505T220000
-DTEND;VALUE=DATE-TIME:20110505T223000
-DTSTAMP:20110430T192946Z
-URL;VALUE=URI:
-SUMMARY:30 Rock - S05E23 - Respawn
-END:VEVENT
-BEGIN:VEVENT
-UID:20110505T200000Z-79@tvcountdown.com
-DTSTART;VALUE=DATE-TIME:20110505T200000
-DTEND;VALUE=DATE-TIME:20110505T203000
-DTSTAMP:20110430T192946Z
-URL;VALUE=URI:
-SUMMARY:The Big Bang Theory - S04E22 - The Wildebeest Implementation
-END:VEVENT
-BEGIN:VEVENT
-UID:20110504T230000Z-289@tvcountdown.com
-DTSTART;VALUE=DATE-TIME:20110504T230000
-DTEND;VALUE=DATE-TIME:20110504T233000
-DTSTAMP:20110430T192946Z
-URL;VALUE=URI:
-SUMMARY:The Daily Show - S16E59 - David Barton
-END:VEVENT
-BEGIN:VEVENT
-UID:20110503T230000Z-289@tvcountdown.com
-DTSTART;VALUE=DATE-TIME:20110503T230000
-DTEND;VALUE=DATE-TIME:20110503T233000
-DTSTAMP:20110430T192946Z
-URL;VALUE=URI:
-SUMMARY:The Daily Show - S16E58 - Rachel Maddow
-END:VEVENT
-BEGIN:VEVENT
-UID:20110502T230000Z-289@tvcountdown.com
-DTSTART;VALUE=DATE-TIME:20110502T230000
-DTEND;VALUE=DATE-TIME:20110502T233000
-DTSTAMP:20110430T192946Z
-URL;VALUE=URI:
-SUMMARY:The Daily Show - S16E57 - Philip K. Howard
-END:VEVENT
-BEGIN:VEVENT
-UID:20110428T230000Z-289@tvcountdown.com
-DTSTART;VALUE=DATE-TIME:20110428T230000
-DTEND;VALUE=DATE-TIME:20110428T233000
-DTSTAMP:20110430T192946Z
-URL;VALUE=URI:
-SUMMARY:The Daily Show - S16E56 - William Cohan
-END:VEVENT
-BEGIN:VEVENT
-UID:20110428T220000Z-83@tvcountdown.com
-DTSTART;VALUE=DATE-TIME:20110428T220000
-DTEND;VALUE=DATE-TIME:20110428T223000
-DTSTAMP:20110430T192946Z
-URL;VALUE=URI:
-SUMMARY:30 Rock - S05E22 - Everything Sunny All the Time Always
-END:VEVENT
-BEGIN:VEVENT
-UID:20110428T200000Z-79@tvcountdown.com
-DTSTART;VALUE=DATE-TIME:20110428T200000
-DTEND;VALUE=DATE-TIME:20110428T203000
-DTSTAMP:20110430T192946Z
-URL;VALUE=URI:
-SUMMARY:The Big Bang Theory - S04E21 - The Agreement Dissection
-END:VEVENT
-BEGIN:VEVENT
-UID:20110427T230000Z-289@tvcountdown.com
-DTSTART;VALUE=DATE-TIME:20110427T230000
-DTEND;VALUE=DATE-TIME:20110427T233000
-DTSTAMP:20110430T192946Z
-URL;VALUE=URI:
-SUMMARY:The Daily Show - S16E55 - Sen. Bernie Sanders
-END:VEVENT
-BEGIN:VEVENT
-UID:20110426T230000Z-289@tvcountdown.com
-DTSTART;VALUE=DATE-TIME:20110426T230000
-DTEND;VALUE=DATE-TIME:20110426T233000
-DTSTAMP:20110430T192946Z
-URL;VALUE=URI:
-SUMMARY:The Daily Show - S16E54 - Elizabeth Warren
-END:VEVENT
-BEGIN:VEVENT
-UID:20110425T230000Z-289@tvcountdown.com
-DTSTART;VALUE=DATE-TIME:20110425T230000
-DTEND;VALUE=DATE-TIME:20110425T233000
-DTSTAMP:20110430T192946Z
-URL;VALUE=URI:
-SUMMARY:The Daily Show - S16E53 - Gigi Ibrahim
-END:VEVENT
-BEGIN:VEVENT
-UID:20110421T220000Z-83@tvcountdown.com
-DTSTART;VALUE=DATE-TIME:20110421T220000
-DTEND;VALUE=DATE-TIME:20110421T223000
-DTSTAMP:20110430T192946Z
-URL;VALUE=URI:
-SUMMARY:30 Rock - S05E21 - 100th Episode Part 2 of 2
-END:VEVENT
-BEGIN:VEVENT
-UID:20110421T220000Z-83@tvcountdown.com
-DTSTART;VALUE=DATE-TIME:20110421T220000
-DTEND;VALUE=DATE-TIME:20110421T223000
-DTSTAMP:20110430T192946Z
-URL;VALUE=URI:
-SUMMARY:30 Rock - S05E20 - 100th Episode Part 1 of 2
-END:VEVENT
-BEGIN:VEVENT
-UID:20110414T230000Z-289@tvcountdown.com
-DTSTART;VALUE=DATE-TIME:20110414T230000
-DTEND;VALUE=DATE-TIME:20110414T233000
-DTSTAMP:20110430T192946Z
-URL;VALUE=URI:
-SUMMARY:The Daily Show - S16E52 - Ricky Gervais
-END:VEVENT
-BEGIN:VEVENT
-UID:20110414T220000Z-83@tvcountdown.com
-DTSTART;VALUE=DATE-TIME:20110414T220000
-DTEND;VALUE=DATE-TIME:20110414T223000
-DTSTAMP:20110430T192946Z
-URL;VALUE=URI:
-SUMMARY:30 Rock - S05E19 - I Heart Connecticut
-END:VEVENT
-BEGIN:VEVENT
-UID:20110413T230000Z-289@tvcountdown.com
-DTSTART;VALUE=DATE-TIME:20110413T230000
-DTEND;VALUE=DATE-TIME:20110413T233000
-DTSTAMP:20110430T192946Z
-URL;VALUE=URI:
-SUMMARY:The Daily Show - S16E51 - Tracy Morgan
-END:VEVENT
-BEGIN:VEVENT
-UID:20110412T230000Z-289@tvcountdown.com
-DTSTART;VALUE=DATE-TIME:20110412T230000
-DTEND;VALUE=DATE-TIME:20110412T233000
-DTSTAMP:20110430T192946Z
-URL;VALUE=URI:
-SUMMARY:The Daily Show - S16E50 - Gov. Deval Patrick
-END:VEVENT
-BEGIN:VEVENT
-UID:20110411T230000Z-289@tvcountdown.com
-DTSTART;VALUE=DATE-TIME:20110411T230000
-DTEND;VALUE=DATE-TIME:20110411T233000
-DTSTAMP:20110430T192946Z
-URL;VALUE=URI:
-SUMMARY:The Daily Show - S16E49 - Foo Fighters
-END:VEVENT
-BEGIN:VEVENT
-UID:20110407T230000Z-289@tvcountdown.com
-DTSTART;VALUE=DATE-TIME:20110407T230000
-DTEND;VALUE=DATE-TIME:20110407T233000
-DTSTAMP:20110430T192946Z
-URL;VALUE=URI:
-SUMMARY:The Daily Show - S16E48 - Jamie Oliver
-END:VEVENT
-BEGIN:VEVENT
-UID:20110407T200000Z-79@tvcountdown.com
-DTSTART;VALUE=DATE-TIME:20110407T200000
-DTEND;VALUE=DATE-TIME:20110407T203000
-DTSTAMP:20110430T192946Z
-URL;VALUE=URI:
-SUMMARY:The Big Bang Theory - S04E20 - The Herb Garden Germination
-END:VEVENT
-BEGIN:VEVENT
-UID:20110406T230000Z-289@tvcountdown.com
-DTSTART;VALUE=DATE-TIME:20110406T230000
-DTEND;VALUE=DATE-TIME:20110406T233000
-DTSTAMP:20110430T192946Z
-URL;VALUE=URI:
-SUMMARY:The Daily Show - S16E47 - Mike Huckabee
-END:VEVENT
-BEGIN:VEVENT
-UID:20110405T230000Z-289@tvcountdown.com
-DTSTART;VALUE=DATE-TIME:20110405T230000
-DTEND;VALUE=DATE-TIME:20110405T233000
-DTSTAMP:20110430T192946Z
-URL;VALUE=URI:
-SUMMARY:The Daily Show - S16E46 - Colin Quinn
-END:VEVENT
-BEGIN:VEVENT
-UID:20110404T230000Z-289@tvcountdown.com
-DTSTART;VALUE=DATE-TIME:20110404T230000
-DTEND;VALUE=DATE-TIME:20110404T233000
-DTSTAMP:20110430T192946Z
-URL;VALUE=URI:
-SUMMARY:The Daily Show - S16E45 - Billy Crystal
-END:VEVENT
-BEGIN:VEVENT
-UID:20110331T230000Z-289@tvcountdown.com
-DTSTART;VALUE=DATE-TIME:20110331T230000
-DTEND;VALUE=DATE-TIME:20110331T233000
-DTSTAMP:20110430T192946Z
-URL;VALUE=URI:
-SUMMARY:The Daily Show - S16E44 - Norm MacDonald
-END:VEVENT
-BEGIN:VEVENT
-UID:20110331T200000Z-79@tvcountdown.com
-DTSTART;VALUE=DATE-TIME:20110331T200000
-DTEND;VALUE=DATE-TIME:20110331T203000
-DTSTAMP:20110430T192946Z
-URL;VALUE=URI:
-SUMMARY:The Big Bang Theory - S04E19 - The Zarnecki Incursion
-END:VEVENT
-END:VCALENDAR

modules/default/calendar/vendor/ical.js/test/test4.ics

@@ -1,747 +0,0 @@
-BEGIN:VCALENDAR
-X-WR-CALNAME:John Doe (TripIt)
-X-WR-CALDESC:TripIt Calendar
-X-PUBLISHED-TTL:PT15M
-PRODID:-//John Doe/NONSGML Bennu 0.1//EN
-VERSION:2.0
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-UID:c32a5eaba2354bb29e012ec18da827db90550a3b@tripit.com
-DTSTART;VALUE=DATE:20111011
-DTEND;VALUE=DATE:20111014
-SUMMARY:South San Francisco\, CA\, October 2011\;
-LOCATION:South San Francisco\, CA
-GEO:37.654656;-122.40775
-TRANSP:TRANSPARENT
-DESCRIPTION:John Doe is in South San Francisco\, CA from Oct 11 
- to Oct 13\, 2011\nView and/or edit details in TripIt : http://www.tripit.c
- om/trip/show/id/23710889\nTripIt - organize your travel at http://www.trip
- it.com\n
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-TRANSP:TRANSPARENT
-UID:item-ee275ccffa83f492d9eb63b01953b39f18d4f944@tripit.com
-DTSTART:20111011T100500
-DTEND:20111011T110500
-SUMMARY:Directions from SFO to Embassy Suites San Francisco Airport - Sout
- h San Francisco
-LOCATION:250 GATEWAY BLVD\, South San Francisco\, CA\, 94080
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/1234\n \n[Directions] 10/11/2011 10:05am - Directions from S
- FO to Embassy Suites San Francisco Airport - South San Francisco \nfrom: S
- FO \nto: 250 GATEWAY BLVD\, South San Francisco\, CA\, 94080 \nView direct
- ions here: http://maps.google.com/maps?output=mobile&saddr=SFO&daddr=250+G
- ATEWAY+BLVD%2C+South+San+Francisco%2C+CA%2C+94080 \n \n \n\nTripIt - organ
- ize your travel at http://www.tripit.com
-GEO:37.655634;-122.401273
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-DTEND:20111011T165500Z
-SUMMARY:US403 PHX to SFO
-LOCATION:Phoenix (PHX)
-UID:item-c576afd397cf1f90578b4ba35e781b61ba8897db@tripit.com
-DTSTART:20111011T144500Z
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/1234\n \n[Flight] 10/11/2011 US Airways(US) #403 dep PHX 7:4
- 5am MST arr SFO 9:55am PDT\; John Doe\; seat(s) 8B\; conf #DXH9K
- Z\, BXQ9WH \nBooked on http://www.americanexpress-travel.com/\; Reference 
- #: 4127 8626 9715\; http://www.americanexpress-travel.com/\; US:1-800-297-
- 2977\, Outside:210-582-2716 \n \n \n\nTripIt - organize your travel at htt
- p://www.tripit.com
-GEO:37.618889;-122.375
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-SUMMARY:Pick-up Rental Car: Dollar Rent A Car
-TRANSP:TRANSPARENT
-UID:item-e99a90ee1c7e4f5b68a4e551009e5bb6c475940c@tripit.com
-DTSTART:20111011T172500Z
-DTEND:20111011T182500Z
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/1234\n \n[Car Rental] Dollar Rent A Car\; San Francisco Inte
- rnational Airport\; primary driver John Doe\; conf #R9508361 \np
- ickup 10/11/2011 10:25am\; dropoff 10/13/2011 6:49pm \nEconomy \nBooked on
-  http://www.americanexpress-travel.com/\; Reference #: 4127 8626 9715\; ht
- tp://www.americanexpress-travel.com/\; US:1-800-297-2977\, Outside:210-582
- -2716 \n \n \n\nTripIt - organize your travel at http://www.tripit.com
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-SUMMARY:Check-in: Embassy Suites San Francisco Airport - South San Francis
- co
-TRANSP:TRANSPARENT
-UID:item-7f3288d418bed063cc82b4512e792fbb5d8ae761@tripit.com
-DTSTART:20111011T185500Z
-DTEND:20111011T195500Z
-LOCATION:250 GATEWAY BLVD\, South San Francisco\, CA\, 94080
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/23710889\n \n[Lodging] Embassy Suites San Francisco Airport - So
- uth San Francisco\; primary guest John Doe\; conf #R9508361 \n25
- 0 GATEWAY BLVD\, South San Francisco\, CA\, 94080\; tel 1.650.589.3400 \na
- rrive 10/11/2011\; depart 10/13/2011\; rooms: 1 \nBooked on http://www.ame
- ricanexpress-travel.com/\; Reference #: 4127 8626 9715\; http://www.americ
- anexpress-travel.com/\; US:1-800-297-2977\, Outside:210-582-2716 \n \n \n\
- nTripIt - organize your travel at http://www.tripit.com
-GEO:37.655634;-122.401273
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-SUMMARY:Check-out: Embassy Suites San Francisco Airport - South San Franci
- sco
-TRANSP:TRANSPARENT
-UID:item-5eb4cb5fc25c55b0423921e18336e57f8c34598d@tripit.com
-DTSTART:20111014T011900Z
-DTEND:20111014T021900Z
-LOCATION:250 GATEWAY BLVD\, South San Francisco\, CA\, 94080
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/23710889\n \n[Lodging] Embassy Suites San Francisco Airport - So
- uth San Francisco\; primary guest John Doe\; conf #R9508361 \n25
- 0 GATEWAY BLVD\, South San Francisco\, CA\, 94080\; tel 1.650.589.3400 \na
- rrive 10/11/2011\; depart 10/13/2011\; rooms: 1 \nBooked on http://www.ame
- ricanexpress-travel.com/\; Reference #: 4127 8626 9715\; http://www.americ
- anexpress-travel.com/\; US:1-800-297-2977\, Outside:210-582-2716 \n \n \n\
- nTripIt - organize your travel at http://www.tripit.com
-GEO:37.655634;-122.401273
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-SUMMARY:Drop-off Rental Car: Dollar Rent A Car
-TRANSP:TRANSPARENT
-UID:item-11fdbf5d02e84646025716d9f9c7a4158e1fb025@tripit.com
-DTSTART:20111014T014900Z
-DTEND:20111014T024900Z
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/23710889\n \n[Car Rental] Dollar Rent A Car\; San Francisco Inte
- rnational Airport\; primary driver John Doe\; conf #R9508361 \np
- ickup 10/11/2011 10:25am\; dropoff 10/13/2011 6:49pm \nEconomy \nBooked on
-  http://www.americanexpress-travel.com/\; Reference #: 4127 8626 9715\; ht
- tp://www.americanexpress-travel.com/\; US:1-800-297-2977\, Outside:210-582
- -2716 \n \n \n\nTripIt - organize your travel at http://www.tripit.com
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-DTEND:20111014T051900Z
-SUMMARY:CO6256 SFO to PHX
-LOCATION:San Francisco (SFO)
-UID:item-cb485a571a01972d6bdc74c2b829905d6e3786bf@tripit.com
-DTSTART:20111014T031900Z
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/23710889\n \n[Flight] 10/13/2011 Continental Airlines(CO) #6256 
- dep SFO 8:19pm PDT arr PHX 10:19pm MST\; John Doe\; conf #DXH9KZ
- \, BXQ9WH(Operated by United Airlines flight 6256) \nBooked on http://www.
- americanexpress-travel.com/\; Reference #: 4127 8626 9715\; http://www.ame
- ricanexpress-travel.com/\; US:1-800-297-2977\, Outside:210-582-2716 \n \n 
- \n\nTripIt - organize your travel at http://www.tripit.com
-GEO:33.436111;-112.009444
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-UID:c7b133db1e7be2713a4a63b75dcbad209690cab5@tripit.com
-DTSTART;VALUE=DATE:20111023
-DTEND;VALUE=DATE:20111028
-SUMMARY:Santa Barbara\, CA\, October 2011
-LOCATION:Santa Barbara\, CA
-GEO:34.420831;-119.69819
-TRANSP:TRANSPARENT
-DESCRIPTION:John Doe is in Santa Barbara\, CA from Oct 23 to Oct
-  27\, 2011\nView and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/24259445\nTripIt - organize your travel at http://www.tripit.com
- \n
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-DTEND:20111023T191200Z
-SUMMARY:US2719 PHX to SBA
-LOCATION:Phoenix (PHX)
-UID:item-c4375369e9070fcc04df39ed18c4d93087577591@tripit.com
-DTSTART:20111023T173500Z
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/24259445\n \n[Flight] 10/23/2011 US Airways(US) #2719 dep PHX 10
- :35am MST arr SBA 12:12pm PDT\; John Doe Ticket #0378717202638\;
-  conf #A44XS5\, PRX98G\, FYYJZ4 \nBooked on http://www.americanexpress-tra
- vel.com/\; Reference #: 7128 8086 8504\; http://www.americanexpress-travel
- .com/\; US:1-800-297-2977\, Outside:210-582-2716\; Total Cost: $699.99 \n 
- \n \n\nTripIt - organize your travel at http://www.tripit.com
-GEO:34.427778;-119.839444
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-TRANSP:TRANSPARENT
-UID:item-962e4f045d12149319d1837ec096bf43770abd6e@tripit.com
-DTSTART:20111025T094000
-DTEND:20111025T104000
-SUMMARY:Directions from Hertz to Sofitel San Francisco Bay
-LOCATION:223 Twin Dolphin Drive\, Redwood City\, CA\, 94065
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/24259445\n \n[Directions] 10/25/2011 9:40am - Directions from He
- rtz to Sofitel San Francisco Bay \nfrom: 780 McDonnell Road\, San Francisc
- o\, CA\, 94128 \nto: 223 Twin Dolphin Drive\, Redwood City\, CA\, 94065 \n
- View directions here: http://maps.google.com/maps?output=mobile&saddr=780+
- McDonnell+Road%2C+San+Francisco%2C+CA%2C+94128&daddr=223+Twin+Dolphin+Driv
- e%2C+Redwood+City%2C+CA%2C+94065 \n \n \n\nTripIt - organize your travel a
- t http://www.tripit.com
-GEO:37.5232475;-122.261296
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-DTEND:20111025T162600Z
-SUMMARY:UA5304 SBA to SFO
-LOCATION:Santa Barbara (SBA)
-UID:item-ae300a6934c3820974dba2c9c5b8fae843c67693@tripit.com
-DTSTART:20111025T150900Z
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/24259445\n \n[Flight] 10/25/2011 United Airlines(UA) #5304 dep S
- BA 8:09am PDT arr SFO 9:26am PDT\; John Doe Ticket #037871720263
- 8\; seat(s) 11B\; conf #A44XS5\, PRX98G\, FYYJZ4 \nBooked on http://www.am
- ericanexpress-travel.com/\; Reference #: 7128 8086 8504\; http://www.ameri
- canexpress-travel.com/\; US:1-800-297-2977\, Outside:210-582-2716\; Total 
- Cost: $699.99 \n \n \n\nTripIt - organize your travel at http://www.tripit
- .com
-GEO:37.618889;-122.375
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-SUMMARY:Pick-up Rental Car: Hertz
-TRANSP:TRANSPARENT
-UID:item-2a9fd5a57a4cdda4677fc6ce23738e1954fdbe2a@tripit.com
-DTSTART:20111025T163000Z
-DTEND:20111025T173000Z
-LOCATION:780 McDonnell Road\, San Francisco\, CA\, 94128
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/24259445\n \n[Car Rental] Hertz\; San Francisco International Ai
- rport\; primary driver John Doe\; conf #F2633064194 \n780 McDonn
- ell Road\, San Francisco\, CA\, 94128 \npickup 10/25/2011 9:30am\; dropoff
-  10/27/2011 7:00pm \nToyota Corolla or similar\; 84.57 USD \nBooked on htt
- p://www.hertz.com/\; Reference #: F2633064194\; http://www.hertz.com/\; 80
- 0-654-3131\; Booking Rate: 84.57 USD\; Total Cost: 333.76 USD \n \n \n\nTr
- ipIt - organize your travel at http://www.tripit.com
-GEO:37.6297569;-122.4000351
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-TRANSP:TRANSPARENT
-UID:item-98dfcb0bcfdcffcce9c58a84947212ed67cadda6@tripit.com
-DTSTART:20111025T163600Z
-DTEND:20111025T173600Z
-SUMMARY:Directions from SFO to Sofitel San Francisco Bay
-LOCATION:223 Twin Dolphin Drive\, Redwood City\, CA\, 94065
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/24259445\n \n[Directions] 10/25/2011 9:36am - Directions from SF
- O to Sofitel San Francisco Bay \nfrom: SFO \nto: 223 Twin Dolphin Drive\, 
- Redwood City\, CA\, 94065 \nView directions here: http://maps.google.com/m
- aps?output=mobile&saddr=SFO&daddr=223+Twin+Dolphin+Drive%2C+Redwood+City%2
- C+CA%2C+94065 \n \n \n\nTripIt - organize your travel at http://www.tripit
- .com
-GEO:37.5232475;-122.261296
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-SUMMARY:Check-in: Sofitel San Francisco Bay
-TRANSP:TRANSPARENT
-UID:item-8de3937b336c333faf2d55ad0a41c5ca6cc02393@tripit.com
-DTSTART:20111025T220000Z
-DTEND:20111025T230000Z
-LOCATION:223 Twin Dolphin Drive\, Redwood City\, CA\, 94065
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/24259445\n \n[Lodging] Sofitel San Francisco Bay\; primary guest
-  John Doe\; conf #F80-0GMW \n223 Twin Dolphin Drive\, Redwood Ci
- ty\, CA\, 94065\; tel (+1)650/598-9000 \narrive 10/25/2011\; depart 10/27/
- 2011\; rooms: 1 \nBooked on http://www.sofitel.com/\; http://www.sofitel.c
- om/\; Total Cost: 564.00 USD \n \n \n\nTripIt - organize your travel at ht
- tp://www.tripit.com
-GEO:37.5232475;-122.261296
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-SUMMARY:Check-out: Sofitel San Francisco Bay
-TRANSP:TRANSPARENT
-UID:item-f3ade58646964bde101616a6d26ea7784a1a81e8@tripit.com
-DTSTART:20111027T190000Z
-DTEND:20111027T200000Z
-LOCATION:223 Twin Dolphin Drive\, Redwood City\, CA\, 94065
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/24259445\n \n[Lodging] Sofitel San Francisco Bay\; primary guest
-  John Doe\; conf #F80-0GMW \n223 Twin Dolphin Drive\, Redwood Ci
- ty\, CA\, 94065\; tel (+1)650/598-9000 \narrive 10/25/2011\; depart 10/27/
- 2011\; rooms: 1 \nBooked on http://www.sofitel.com/\; http://www.sofitel.c
- om/\; Total Cost: 564.00 USD \n \n \n\nTripIt - organize your travel at ht
- tp://www.tripit.com
-GEO:37.5232475;-122.261296
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-SUMMARY:Drop-off Rental Car: Hertz
-TRANSP:TRANSPARENT
-UID:item-50620273fea0614d37775649034d5e1de92ae361@tripit.com
-DTSTART:20111028T020000Z
-DTEND:20111028T030000Z
-LOCATION:780 McDonnell Road\, San Francisco\, CA\, 94128
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/24259445\n \n[Car Rental] Hertz\; San Francisco International Ai
- rport\; primary driver John Doe\; conf #F2633064194 \n780 McDonn
- ell Road\, San Francisco\, CA\, 94128 \npickup 10/25/2011 9:30am\; dropoff
-  10/27/2011 7:00pm \nToyota Corolla or similar\; 84.57 USD \nBooked on htt
- p://www.hertz.com/\; Reference #: F2633064194\; http://www.hertz.com/\; 80
- 0-654-3131\; Booking Rate: 84.57 USD\; Total Cost: 333.76 USD \n \n \n\nTr
- ipIt - organize your travel at http://www.tripit.com
-GEO:37.6297569;-122.4000351
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-DTEND:20111028T051900Z
-SUMMARY:CO6256 SFO to PHX
-LOCATION:San Francisco (SFO)
-UID:item-71d327f30d8beeaf7bf50c8fa63ce16005b9b0df@tripit.com
-DTSTART:20111028T031900Z
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/24259445\n \n[Flight] 10/27/2011 Continental Airlines(CO) #6256 
- dep SFO 8:19pm PDT arr PHX 10:19pm MST\; John Doe Ticket #037871
- 7202638\; seat(s) 17D\; conf #A44XS5\, PRX98G\, FYYJZ4(Operated by United 
- Airlines flight 6256) \nBooked on http://www.americanexpress-travel.com/\;
-  Reference #: 7128 8086 8504\; http://www.americanexpress-travel.com/\; US
- :1-800-297-2977\, Outside:210-582-2716\; Total Cost: $699.99 \n \n \n\nTri
- pIt - organize your travel at http://www.tripit.com
-GEO:33.436111;-112.009444
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-UID:2d4b446e63a94ade7dab0f0e9546b2d1965f011c@tripit.com
-DTSTART;VALUE=DATE:20111108
-DTEND;VALUE=DATE:20111111
-SUMMARY:Redwood City\, CA\, November 2011
-LOCATION:Redwood City\, CA
-GEO:37.485215;-122.236355
-TRANSP:TRANSPARENT
-DESCRIPTION:John Doe is in Redwood City\, CA from Nov 8 to Nov 1
- 0\, 2011\nView and/or edit details in TripIt : http://www.tripit.com/trip/
- show/id/24913749\nTripIt - organize your travel at http://www.tripit.com\n
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-DTEND:20111108T175700Z
-SUMMARY:US403 PHX to SFO
-LOCATION:Phoenix (PHX)
-UID:item-7de7d829b2f95991de6d01c3d68f24b84770168c@tripit.com
-DTSTART:20111108T154500Z
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/24913749\n \n[Flight] 11/8/2011 US Airways(US) #403 dep PHX 8:45
- am MST arr SFO 9:57am PST\; John Doe\; seat(s) 21C\; conf #FJDX0
- J\, I2W8HW \nBooked on http://www.americanexpress-travel.com/\; Reference 
- #: 4129 9623 4732\; http://www.americanexpress-travel.com/\; US:1-800-297-
- 2977\, Outside:210-582-2716 \n \n \n\nTripIt - organize your travel at htt
- p://www.tripit.com
-GEO:37.618889;-122.375
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-SUMMARY:Pick-up Rental Car: Dollar Rent A Car
-TRANSP:TRANSPARENT
-UID:item-1ac6982fefdd79bc5ea849785f415a6291c450b1@tripit.com
-DTSTART:20111108T182700Z
-DTEND:20111108T192700Z
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/24913749\n \n[Car Rental] Dollar Rent A Car\; San Francisco Inte
- rnational Airport\; primary driver John Doe\; conf #Q0058133 \np
- ickup 11/8/2011 10:27am\; dropoff 11/10/2011 6:25pm \nEconomy \nBooked on 
- http://www.americanexpress-travel.com/\; Reference #: 4129 9623 4732\; htt
- p://www.americanexpress-travel.com/\; US:1-800-297-2977\, Outside:210-582-
- 2716 \n \n \n\nTripIt - organize your travel at http://www.tripit.com
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-SUMMARY:Check-in: Sofitel San Francisco Bay
-TRANSP:TRANSPARENT
-UID:item-126e584ffbefbec32a15ca503f0bdf8d3f9cc2f4@tripit.com
-DTSTART:20111108T195700Z
-DTEND:20111108T205700Z
-LOCATION:223 TWIN DOLPHIN DR\, Redwood City\, CA\, 94065-1514
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/24913749\n \n[Lodging] Sofitel San Francisco Bay\; primary guest
-  John Doe\; conf #Q0058133 \n223 TWIN DOLPHIN DR\, Redwood City\
- , CA\, 94065-1514\; tel 1.650.598.9000 \narrive 11/8/2011\; depart 11/10/2
- 011\; rooms: 1 \nBooked on http://www.americanexpress-travel.com/\; Refere
- nce #: 4129 9623 4732\; http://www.americanexpress-travel.com/\; US:1-800-
- 297-2977\, Outside:210-582-2716 \n \n \n\nTripIt - organize your travel at
-  http://www.tripit.com
-GEO:37.5232475;-122.261296
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-SUMMARY:Check-out: Sofitel San Francisco Bay
-TRANSP:TRANSPARENT
-UID:item-ff48c502022356ccaa862ebb61761a0de08a1ce9@tripit.com
-DTSTART:20111111T015500Z
-DTEND:20111111T025500Z
-LOCATION:223 TWIN DOLPHIN DR\, Redwood City\, CA\, 94065-1514
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/24913749\n \n[Lodging] Sofitel San Francisco Bay\; primary guest
-  John Doe\; conf #Q0058133 \n223 TWIN DOLPHIN DR\, Redwood City\
- , CA\, 94065-1514\; tel 1.650.598.9000 \narrive 11/8/2011\; depart 11/10/2
- 011\; rooms: 1 \nBooked on http://www.americanexpress-travel.com/\; Refere
- nce #: 4129 9623 4732\; http://www.americanexpress-travel.com/\; US:1-800-
- 297-2977\, Outside:210-582-2716 \n \n \n\nTripIt - organize your travel at
-  http://www.tripit.com
-GEO:37.5232475;-122.261296
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-SUMMARY:Drop-off Rental Car: Dollar Rent A Car
-TRANSP:TRANSPARENT
-UID:item-c0273c03ddbb68a9b05d5d43a489bc318136ca42@tripit.com
-DTSTART:20111111T022500Z
-DTEND:20111111T032500Z
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/24913749\n \n[Car Rental] Dollar Rent A Car\; San Francisco Inte
- rnational Airport\; primary driver John Doe\; conf #Q0058133 \np
- ickup 11/8/2011 10:27am\; dropoff 11/10/2011 6:25pm \nEconomy \nBooked on 
- http://www.americanexpress-travel.com/\; Reference #: 4129 9623 4732\; htt
- p://www.americanexpress-travel.com/\; US:1-800-297-2977\, Outside:210-582-
- 2716 \n \n \n\nTripIt - organize your travel at http://www.tripit.com
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-DTEND:20111111T055400Z
-SUMMARY:CO496 SFO to PHX
-LOCATION:San Francisco (SFO)
-UID:item-3473cf9275326ac393b37859df3b04306b4849aa@tripit.com
-DTSTART:20111111T035500Z
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/24913749\n \n[Flight] 11/10/2011 Continental Airlines(CO) #496 d
- ep SFO 7:55pm PST arr PHX 10:54pm MST\; John Doe\; seat(s) 26B\;
-  conf #FJDX0J\, I2W8HW(Operated by United Airlines flight 496) \nBooked on
-  http://www.americanexpress-travel.com/\; Reference #: 4129 9623 4732\; ht
- tp://www.americanexpress-travel.com/\; US:1-800-297-2977\, Outside:210-582
- -2716 \n \n \n\nTripIt - organize your travel at http://www.tripit.com
-GEO:33.436111;-112.009444
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-UID:4ee5ded058432990e3d8808f48ca851e04923b6d@tripit.com
-DTSTART;VALUE=DATE:20111129
-DTEND;VALUE=DATE:20111202
-SUMMARY:Milpitas\, CA\, November 2011
-LOCATION:Milpitas\, CA
-GEO:37.428272;-121.906624
-TRANSP:TRANSPARENT
-DESCRIPTION:John Doe is in Milpitas\, CA from Nov 29 to Dec 1\, 
- 2011\nView and/or edit details in TripIt : http://www.tripit.com/trip/show
- /id/25671681\nTripIt - organize your travel at http://www.tripit.com\n
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-DTEND:20111129T172400Z
-SUMMARY:US282 PHX to SJC
-LOCATION:Phoenix (PHX)
-UID:item-644d5973b50d521d50e475ccf5321605d54bd0d5@tripit.com
-DTSTART:20111129T152500Z
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/25671681\n \n[Flight] 11/29/2011 US Airways(US) #282 dep PHX 8:2
- 5am MST arr SJC 9:24am PST\; John Doe\; seat(s) 17C\; conf #DQKD
- GY \nBooked on http://www.americanexpress-travel.com/\; Reference #: 4131 
- 3301 9911\; http://www.americanexpress-travel.com/\; US:1-800-297-2977\, O
- utside:210-582-2716 \n \n \n\nTripIt - organize your travel at http://www.
- tripit.com
-GEO:37.361111;-121.925556
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-SUMMARY:Pick-up Rental Car: Alamo
-TRANSP:TRANSPARENT
-UID:item-10368bbdbc9b6f26f83098500633cc4eb604c751@tripit.com
-DTSTART:20111129T175400Z
-DTEND:20111129T185400Z
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/25671681\n \n[Car Rental] Alamo\; San Jose International Airport
- \; primary driver John Doe\; conf #372828149COUNT \npickup 11/29
- /2011 9:54am\; dropoff 12/1/2011 5:45pm \nIntermediate \nBooked on http://
- www.americanexpress-travel.com/\; Reference #: 4131 3301 9911\; http://www
- .americanexpress-travel.com/\; US:1-800-297-2977\, Outside:210-582-2716 \n
-  \n \n\nTripIt - organize your travel at http://www.tripit.com
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-SUMMARY:Check-in: The Beverly Heritage Hotel
-TRANSP:TRANSPARENT
-UID:item-98d8638d3f1c011d03cb8f58b3a14a0f1203339b@tripit.com
-DTSTART:20111129T192400Z
-DTEND:20111129T202400Z
-LOCATION:1820 Barber Lane\, Milpitas\, CA\, 95035
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/25671681\n \n[Lodging] The Beverly Heritage Hotel\; primary gues
- t John Doe\; conf #372828149COUNT \n1820 Barber Lane\, Milpitas\
- , CA\, 95035\; tel 1.408.943.9080 \narrive 11/29/2011\; depart 12/1/2011\;
-  rooms: 1 \nBooked on http://www.americanexpress-travel.com/\; Reference #
- : 4131 3301 9911\; http://www.americanexpress-travel.com/\; US:1-800-297-2
- 977\, Outside:210-582-2716 \n \n \n\nTripIt - organize your travel at http
- ://www.tripit.com
-GEO:37.4010467;-121.9116284
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-DTEND:20111201T194400Z
-SUMMARY:US273 SJC to PHX
-LOCATION:San Jose (SJC)
-UID:item-7b9ee9bb4edfe69743e32b33f9be55753956a883@tripit.com
-DTSTART:20111201T175900Z
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/25671681\n \n[Flight] 12/1/2011 US Airways(US) #273 dep SJC 9:59
- am PST arr PHX 12:44pm MST\; John Doe Ticket #0378727451156\; co
- nf #EMF71T \nBooked on http://www.americanexpress-travel.com/\; Reference 
- #: 5133 5264 1627\; http://www.americanexpress-travel.com/\; US:1-800-297-
- 2977\, Outside:210-582-2716\; Total Cost: $316.69 \n \n \n\nTripIt - organ
- ize your travel at http://www.tripit.com
-GEO:33.436111;-112.009444
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-SUMMARY:Check-out: The Beverly Heritage Hotel
-TRANSP:TRANSPARENT
-UID:item-f79f203072002b8f06598dcb2be0e36af17b625b@tripit.com
-DTSTART:20111202T011500Z
-DTEND:20111202T021500Z
-LOCATION:1820 Barber Lane\, Milpitas\, CA\, 95035
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/25671681\n \n[Lodging] The Beverly Heritage Hotel\; primary gues
- t John Doe\; conf #372828149COUNT \n1820 Barber Lane\, Milpitas\
- , CA\, 95035\; tel 1.408.943.9080 \narrive 11/29/2011\; depart 12/1/2011\;
-  rooms: 1 \nBooked on http://www.americanexpress-travel.com/\; Reference #
- : 4131 3301 9911\; http://www.americanexpress-travel.com/\; US:1-800-297-2
- 977\, Outside:210-582-2716 \n \n \n\nTripIt - organize your travel at http
- ://www.tripit.com
-GEO:37.4010467;-121.9116284
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-SUMMARY:Drop-off Rental Car: Alamo
-TRANSP:TRANSPARENT
-UID:item-69f526ad49fa8ca0a74486f4fc77cc3f9d23a72f@tripit.com
-DTSTART:20111202T014500Z
-DTEND:20111202T024500Z
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/25671681\n \n[Car Rental] Alamo\; San Jose International Airport
- \; primary driver John Doe\; conf #372828149COUNT \npickup 11/29
- /2011 9:54am\; dropoff 12/1/2011 5:45pm \nIntermediate \nBooked on http://
- www.americanexpress-travel.com/\; Reference #: 4131 3301 9911\; http://www
- .americanexpress-travel.com/\; US:1-800-297-2977\, Outside:210-582-2716 \n
-  \n \n\nTripIt - organize your travel at http://www.tripit.com
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-DTEND:20111202T045900Z
-SUMMARY:US288 SJC to PHX
-LOCATION:San Jose (SJC)
-UID:item-dab68a87c8dd49064ab0ba1dec5ba75ba46ff1d3@tripit.com
-DTSTART:20111202T031500Z
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/25671681\n \n[Flight] 12/1/2011 US Airways(US) #288 dep SJC 7:15
- pm PST arr PHX 9:59pm MST\; John Doe\; seat(s) 13C\; conf #DQKDG
- Y \nBooked on http://www.americanexpress-travel.com/\; Reference #: 4131 3
- 301 9911\; http://www.americanexpress-travel.com/\; US:1-800-297-2977\, Ou
- tside:210-582-2716 \n \n \n\nTripIt - organize your travel at http://www.t
- ripit.com
-GEO:33.436111;-112.009444
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-UID:67d48ddde166a2e9bbac2cf7d93fe493b0860008@tripit.com
-DTSTART;VALUE=DATE:20111213
-DTEND;VALUE=DATE:20111216
-SUMMARY:San Jose\, CA\, December 2011
-LOCATION:San Jose\, CA
-GEO:37.339386;-121.894955
-TRANSP:TRANSPARENT
-DESCRIPTION:John Doe is in San Jose\, CA from Dec 13 to Dec 15\,
-  2011\nView and/or edit details in TripIt : http://www.tripit.com/trip/sho
- w/id/27037117\nTripIt - organize your travel at http://www.tripit.com\n
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-DTEND:20111213T172400Z
-SUMMARY:US282 PHX to SJC
-LOCATION:Phoenix (PHX)
-UID:item-2b1b9021be548a87dd335f190b60ab78c33b619d@tripit.com
-DTSTART:20111213T152500Z
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/27037117\n \n[Flight] 12/13/2011 US Airways(US) #282 dep PHX 8:2
- 5am MST arr SJC 9:24am PST\; John Doe Ticket #0378728465928\; se
- at(s) 15C\; conf #GGNV29 \nBooked on http://www.americanexpress-travel.com
- /\; Reference #: 3134 0525 5102\; http://www.americanexpress-travel.com/\;
-  US:1-800-297-2977\, Outside:210-582-2716\; Total Cost: $406.39 \n \n \n\n
- TripIt - organize your travel at http://www.tripit.com
-GEO:37.361111;-121.925556
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-SUMMARY:Pick-up Rental Car: Advantage
-TRANSP:TRANSPARENT
-UID:item-619d345bb08aaef68e8767b672277243697f5bff@tripit.com
-DTSTART:20111213T180000Z
-DTEND:20111213T190000Z
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/27037117\n \n[Car Rental] Advantage\; San Jose International Air
- port\; primary driver John Doe\; conf #F31539020E7 \npickup 12/1
- 3/2011 10:00am\; dropoff 12/15/2011 7:00pm \nStandard Convertible \nRefere
- nce #: 3134 0526 3890 \n \n \n\nTripIt - organize your travel at http://ww
- w.tripit.com
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-SUMMARY:Check-in: Crestview Hotel:
-TRANSP:TRANSPARENT
-UID:item-fbe6c08e7523c82fac69b40ad1d0899f3d8d5982@tripit.com
-DTSTART:20111213T192400Z
-DTEND:20111213T202400Z
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/27037117\n \n[Lodging] Crestview Hotel:\; conf #CR31342159 \ntel
-  650-966-8848 \narrive 12/13/2011\; depart 12/15/2011 \nBooking Rate: 153.
- 30 \n \n \n\nTripIt - organize your travel at http://www.tripit.com
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-SUMMARY:Check-out: Crestview Hotel:
-TRANSP:TRANSPARENT
-UID:item-7ed8b84628e650a6b37161c7825bac9e72add49f@tripit.com
-DTSTART:20111216T011500Z
-DTEND:20111216T021500Z
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/27037117\n \n[Lodging] Crestview Hotel:\; conf #CR31342159 \ntel
-  650-966-8848 \narrive 12/13/2011\; depart 12/15/2011 \nBooking Rate: 153.
- 30 \n \n \n\nTripIt - organize your travel at http://www.tripit.com
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-SUMMARY:Drop-off Rental Car: Advantage
-TRANSP:TRANSPARENT
-UID:item-623b54ebe07ffd48845f1a120a86940ce79c698b@tripit.com
-DTSTART:20111216T030000Z
-DTEND:20111216T040000Z
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/27037117\n \n[Car Rental] Advantage\; San Jose International Air
- port\; primary driver John Doe\; conf #F31539020E7 \npickup 12/1
- 3/2011 10:00am\; dropoff 12/15/2011 7:00pm \nStandard Convertible \nRefere
- nce #: 3134 0526 3890 \n \n \n\nTripIt - organize your travel at http://ww
- w.tripit.com
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-DTEND:20111216T045900Z
-SUMMARY:US288 SJC to PHX
-LOCATION:San Jose (SJC)
-UID:item-52481e672972d2e88d5eaa5cf49bb801562c6014@tripit.com
-DTSTART:20111216T031500Z
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/27037117\n \n[Flight] 12/15/2011 US Airways(US) #288 dep SJC 7:1
- 5pm PST arr PHX 9:59pm MST\; John Doe Ticket #0378728465928\; se
- at(s) 7B\; conf #GGNV29 \nBooked on http://www.americanexpress-travel.com/
- \; Reference #: 3134 0525 5102\; http://www.americanexpress-travel.com/\; 
- US:1-800-297-2977\, Outside:210-582-2716\; Total Cost: $406.39 \n \n \n\nT
- ripIt - organize your travel at http://www.tripit.com
-GEO:33.436111;-112.009444
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-UID:7299ff29daed7d5c3e2ed4acc74deec5b7942bd5@tripit.com
-DTSTART;VALUE=DATE:20120103
-DTEND;VALUE=DATE:20120106
-SUMMARY:San Francisco\, CA\, January 2012
-LOCATION:San Francisco\, CA
-GEO:37.774929;-122.419415
-TRANSP:TRANSPARENT
-DESCRIPTION:John Doe is in San Francisco\, CA from Jan 3 to Jan 
- 5\, 2012\nView and/or edit details in TripIt : http://www.tripit.com/trip/
- show/id/27863159\nTripIt - organize your travel at http://www.tripit.com\n
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-DTEND:20120103T175700Z
-SUMMARY:US403 PHX to SFO
-LOCATION:Phoenix (PHX)
-UID:item-f099e76114bf43ef3b122432579d8b40995412a7@tripit.com
-DTSTART:20120103T154500Z
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/27863159\n \n[Flight] 1/3/2012 US Airways(US) #403 dep PHX 8:45a
- m MST arr SFO 9:57am PST\; John Doe Ticket #0378731791515\; conf
-  #FH9B72\, L4F9M5 \nBooked on http://www.americanexpress-travel.com/\; Ref
- erence #: 6135 7391 6119\; http://www.americanexpress-travel.com/\; US:1-8
- 00-297-2977\, Outside:210-582-2716\; Total Cost: $668.39 \n \n \n\nTripIt 
- - organize your travel at http://www.tripit.com
-GEO:37.618889;-122.375
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-SUMMARY:Pick-up Rental Car: Alamo
-TRANSP:TRANSPARENT
-UID:item-fae4b4b07b66fc87df125238e0aaf645106cf4f3@tripit.com
-DTSTART:20120103T180000Z
-DTEND:20120103T190000Z
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/27863159\n \n[Car Rental] Alamo\; San Francisco International Ai
- rport\; primary driver John Doe\; conf #373525981COUNT \npickup 
- 1/3/2012 10:00am\; dropoff 1/5/2012 6:00pm \nCompact \nReference #: 6135 7
- 391 6898 \n \n \n\nTripIt - organize your travel at http://www.tripit.com
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-SUMMARY:Check-in: Grand Hotel Sunnyvale
-TRANSP:TRANSPARENT
-UID:item-d89a856eb9da9dfdcb4da46f42e49af3a838fcbb@tripit.com
-DTSTART:20120103T195700Z
-DTEND:20120103T205700Z
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/27863159\n \n[Lodging] Grand Hotel Sunnyvale\; conf #22084SY0361
- 18 \ntel 1-408-7208500 \narrive 1/3/2012\; depart 1/5/2012 \nBooking Rate:
-  USD 169.00 \nPolicies: Guarantee to valid form of payment is required at 
- time of booking\; Cancel 1 day prior to arrival date to avoid penalty of 1
-  Nights Room Charge. Change fee may apply for early departures and changes
-  made to confirmed reservations.\; \n \n \n\nTripIt - organize your travel
-  at http://www.tripit.com
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-SUMMARY:Check-out: Grand Hotel Sunnyvale
-TRANSP:TRANSPARENT
-UID:item-6edc82f6411fd0b66f2f7f6baafa41623a8623a9@tripit.com
-DTSTART:20120106T010900Z
-DTEND:20120106T020900Z
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/27863159\n \n[Lodging] Grand Hotel Sunnyvale\; conf #22084SY0361
- 18 \ntel 1-408-7208500 \narrive 1/3/2012\; depart 1/5/2012 \nBooking Rate:
-  USD 169.00 \nPolicies: Guarantee to valid form of payment is required at 
- time of booking\; Cancel 1 day prior to arrival date to avoid penalty of 1
-  Nights Room Charge. Change fee may apply for early departures and changes
-  made to confirmed reservations.\; \n \n \n\nTripIt - organize your travel
-  at http://www.tripit.com
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-SUMMARY:Drop-off Rental Car: Alamo
-TRANSP:TRANSPARENT
-UID:item-58a31b96066ffd09b800af49de59a84f7b7a3a06@tripit.com
-DTSTART:20120106T020000Z
-DTEND:20120106T030000Z
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/27863159\n \n[Car Rental] Alamo\; San Francisco International Ai
- rport\; primary driver John Doe\; conf #373525981COUNT \npickup 
- 1/3/2012 10:00am\; dropoff 1/5/2012 6:00pm \nCompact \nReference #: 6135 7
- 391 6898 \n \n \n\nTripIt - organize your travel at http://www.tripit.com
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-DTEND:20120106T050500Z
-SUMMARY:CO496 SFO to PHX
-LOCATION:San Francisco (SFO)
-UID:item-7884351ce42d503b90ccc48c33c7c30bd4f44767@tripit.com
-DTSTART:20120106T030900Z
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/27863159\n \n[Flight] 1/5/2012 Continental Airlines(CO) #496 dep
-  SFO 7:09pm PST arr PHX 10:05pm MST\; John Doe Ticket #037873179
- 1515\; conf #FH9B72\, L4F9M5(Operated by United Airlines flight 496) \nBoo
- ked on http://www.americanexpress-travel.com/\; Reference #: 6135 7391 611
- 9\; http://www.americanexpress-travel.com/\; US:1-800-297-2977\, Outside:2
- 10-582-2716\; Total Cost: $668.39 \n \n \n\nTripIt - organize your travel 
- at http://www.tripit.com
-GEO:33.436111;-112.009444
-END:VEVENT
-END:VCALENDAR

modules/default/calendar/vendor/ical.js/test/test5.ics

@@ -1,41 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Meetup//RemoteApi//EN
-CALSCALE:GREGORIAN
-METHOD:PUBLISH
-X-ORIGINAL-URL:http://www.meetup.com/events/ical/8333638/dfdba2e469216075
- 3404f737feace78d526ff0ce/going
-X-WR-CALNAME:My Meetups
-X-MS-OLK-FORCEINSPECTOROPEN:TRUE
-BEGIN:VTIMEZONE
-TZID:America/Phoenix
-TZURL:http://tzurl.org/zoneinfo-outlook/America/Phoenix
-X-LIC-LOCATION:America/Phoenix
-BEGIN:STANDARD
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-DTSTAMP:20111106T155927Z
-DTSTART;TZID=America/Phoenix:20111109T190000
-DTEND;TZID=America/Phoenix:20111109T210000
-STATUS:CONFIRMED
-SUMMARY:Phoenix Drupal User Group Monthly Meetup
-DESCRIPTION:Phoenix Drupal User Group\nWednesday\, November 9 at 7:00 PM\
- n\nCustomizing node display with template pages in Drupal 6\n\n Jon Shee
- han and Matthew Berry of the Office of Knowledge Enterprise Development 
- (OKED) Knowledge...\n\nDetails: http://www.meetup.com/Phoenix-Drupal-Use
- r-Group/events/33627272/
-CLASS:PUBLIC
-CREATED:20100630T083023Z
-GEO:33.56;-111.90
-LOCATION:Open Source Project Tempe (1415 E University Dr. #103A\, Tempe\,
-  AZ 85281)
-URL:http://www.meetup.com/Phoenix-Drupal-User-Group/events/33627272/
-LAST-MODIFIED:20111102T213309Z
-UID:event_nsmxnyppbfc@meetup.com
-END:VEVENT
-END:VCALENDAR

modules/default/calendar/vendor/ical.js/test/test7.ics

@@ -1,16 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:ownCloud Calendar 0.6.3
-X-WR-CALNAME:Fête Nationale - Férié
-BEGIN:VEVENT
-CREATED:20090502T140513Z
-DTSTAMP:20111106T124709Z
-UID:FA9831E7-C238-4FEC-95E5-CD46BD466421
-SUMMARY:Fête Nationale - Férié
-RRULE:FREQ=YEARLY
-DTSTART;VALUE=DATE:20120714
-DTEND;VALUE=DATE:20120715
-TRANSP:OPAQUE
-SEQUENCE:5
-END:VEVENT
-END:VCALENDAR

modules/default/calendar/vendor/ical.js/test/test8.ics

@@ -1,23 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:ownCloud Calendar 0.6.3
-X-WR-CALNAME:Default calendar
-BEGIN:VTODO
-CREATED;VALUE=DATE-TIME:20130714T092804Z
-UID:0aa462f13c
-LAST-MODIFIED;VALUE=DATE-TIME:20130714T092804Z
-DTSTAMP;VALUE=DATE-TIME:20130714T092804Z
-CATEGORIES:Projets
-SUMMARY:Migrer le blog
-PERCENT-COMPLETE:100
-COMPLETED;VALUE=DATE-TIME;TZID=Europe/Monaco:20130716T105745
-END:VTODO
-BEGIN:VTODO
-CREATED;VALUE=DATE-TIME:20130714T092912Z
-UID:5e05bbcf34
-LAST-MODIFIED;VALUE=DATE-TIME:20130714T092912Z
-DTSTAMP;VALUE=DATE-TIME:20130714T092912Z
-SUMMARY:Créer test unitaire erreur ical
-CATEGORIES:Projets
-END:VTODO
-END:VCALENDAR

modules/default/calendar/vendor/ical.js/test/test9.ics

@@ -1,21 +0,0 @@
-BEGIN:VCALENDAR
-BEGIN:VEVENT
-UID:eb9e1bd2-ceba-499f-be77-f02773954c72
-SUMMARY:Event with an alarm
-DESCRIPTION:This is an event with an alarm.
-ORGANIZER="mailto:stomlinson@mozilla.com"
-DTSTART;TZID="America/Los_Angeles":20130418T110000
-DTEND;TZID="America/Los_Angeles":20130418T120000
-STATUS:CONFIRMED
-CLASS:PUBLIC
-TRANSP:OPAQUE
-LAST-MODIFIED:20130418T175632Z
-DTSTAMP:20130418T175632Z
-SEQUENCE:3
-BEGIN:VALARM
-ACTION:DISPLAY
-TRIGGER;RELATED=START:-PT5M
-DESCRIPTION:Reminder
-END:VALARM
-END:VEVENT
-END:VCALENDAR

modules/default/clock/README.md

@@ -1,41 +1,6 @@
 # Module: Clock
+
 The `clock` module is one of the default modules of the MagicMirror.
 This module displays the current date and time. The information will be updated realtime.
 
-## Using the module
-
-To use this module, add it to the modules array in the `config/config.js` file:
-````javascript
-modules: [
-	{
-		module: "clock",
-		position: "top_left",	// This can be any of the regions.
-		config: {
-			// The config property is optional.
-			// See 'Configuration options' for more information.
-		}
-	}
-]
-````
-
-## Configuration options
-
-The following properties can be configured:
-
-| Option            | Description
-| ----------------- | -----------
-| `timeFormat`      | Use 12 or 24 hour format. <br><br> **Possible values:** `12` or `24` <br> **Default value:** uses value of _config.timeFormat_
-| `displaySeconds`  | Display seconds. <br><br> **Possible values:** `true` or `false` <br> **Default value:** `true`
-| `showPeriod`      | Show the period (am/pm) with 12 hour format. <br><br> **Possible values:** `true` or `false` <br> **Default value:** `true`
-| `showPeriodUpper` | Show the period (AM/PM) with 12 hour format as uppercase. <br><br> **Possible values:** `true` or `false` <br> **Default value:** `false`
-| `clockBold`       | Remove the colon and bold the minutes to make a more modern look. <br><br> **Possible values:** `true` or `false` <br> **Default value:** `false`
-| `showDate`        | Turn off or on the Date section. <br><br> **Possible values:** `true` or `false` <br> **Default value:** `true`
-| `showWeek`        | Turn off or on the Week section. <br><br> **Possible values:** `true` or `false` <br> **Default value:** `false`
-| `dateFormat`      | Configure the date format as you like. <br><br> **Possible values:** [Docs](http://momentjs.com/docs/#/displaying/format/) <br> **Default value:** `"dddd, LL"`
-| `displayType`     | Display a digital clock, analog clock, or both together. <br><br> **Possible values:** `digital`, `analog`, or `both` <br> **Default value:** `digital`
-| `analogSize`      | **Specific to the analog clock.** Defines how large the analog display is. <br><br> **Possible values:** A positive number of pixels` <br> **Default value:** `200px`
-| `analogFace`      | **Specific to the analog clock.** Specifies which clock face to use. <br><br> **Possible values:** `simple` for a simple border, `none` for no face or border, or `face-###` (where ### is currently a value between 001 and 012, inclusive) <br> **Default value:** `simple`
-| `secondsColor`    | **Specific to the analog clock.** Specifies what color to make the 'seconds' hand. <br><br> **Possible values:** `any HTML RGB Color` <br> **Default value:** `#888888`
-| `analogPlacement` | **Specific to the analog clock. _(requires displayType set to `'both'`)_** Specifies where the analog clock is in relation to the digital clock <br><br> **Possible values:** `top`, `right`, `bottom`, or `left` <br> **Default value:** `bottom`
-| `analogShowDate`  | **Specific to the analog clock.** If the clock is used as a separate module and set to analog only, this configures whether a date is also displayed with the clock. <br><br> **Possible values:** `false`, `top`, or `bottom` <br> **Default value:** `top`
-| `timezone`        | Specific a timezone to show clock. <br><br> **Possible examples values:** `America/New_York`, `America/Santiago`, `Etc/GMT+10` <br> **Default value:** `none`. See more informations about configuration value [here](https://momentjs.com/timezone/docs/#/data-formats/packed-format/)
+For configuration options, please check the [MagicMirror² documentation](https://docs.magicmirror.builders/modules/clock.html).

modules/default/clock/clock.js

@@ -1,11 +1,12 @@
-/* global Log, Module, moment, config */
+/* global SunCalc */
+
 /* Magic Mirror
  * Module: Clock
  *
- * By Michael Teeuw http://michaelteeuw.nl
+ * By Michael Teeuw https://michaelteeuw.nl
  * MIT Licensed.
  */
-Module.register("clock",{
+Module.register("clock", {
 	// Module config defaults.
 	defaults: {
 		displayType: "digital", // options: digital, analog, both
@@ -26,32 +27,68 @@ Module.register("clock",{
 		analogShowDate: "top", // options: false, 'top', or 'bottom'
 		secondsColor: "#888888",
 		timezone: null,
+
+		showSunTimes: false,
+		showMoonTimes: false,
+		lat: 47.630539,
+		lon: -122.344147
 	},
 	// Define required scripts.
-	getScripts: function() {
-		return ["moment.js", "moment-timezone.js"];
+	getScripts: function () {
+		return ["moment.js", "moment-timezone.js", "suncalc.js"];
 	},
 	// Define styles.
-	getStyles: function() {
+	getStyles: function () {
 		return ["clock_styles.css"];
 	},
 	// Define start sequence.
-	start: function() {
+	start: function () {
 		Log.info("Starting module: " + this.name);
 
 		// Schedule update interval.
 		var self = this;
-		setInterval(function() {
+		self.second = moment().second();
+		self.minute = moment().minute();
+
+		//Calculate how many ms should pass until next update depending on if seconds is displayed or not
+		var delayCalculator = function (reducedSeconds) {
+			var EXTRA_DELAY = 50; //Deliberate imperceptable delay to prevent off-by-one timekeeping errors
+
+			if (self.config.displaySeconds) {
+				return 1000 - moment().milliseconds() + EXTRA_DELAY;
+			} else {
+				return (60 - reducedSeconds) * 1000 - moment().milliseconds() + EXTRA_DELAY;
+			}
+		};
+
+		//A recursive timeout function instead of interval to avoid drifting
+		var notificationTimer = function () {
 			self.updateDom();
-		}, 1000);
+
+			//If seconds is displayed CLOCK_SECOND-notification should be sent (but not when CLOCK_MINUTE-notification is sent)
+			if (self.config.displaySeconds) {
+				self.second = moment().second();
+				if (self.second !== 0) {
+					self.sendNotification("CLOCK_SECOND", self.second);
+					setTimeout(notificationTimer, delayCalculator(0));
+					return;
+				}
+			}
+
+			//If minute changed or seconds isn't displayed send CLOCK_MINUTE-notification
+			self.minute = moment().minute();
+			self.sendNotification("CLOCK_MINUTE", self.minute);
+			setTimeout(notificationTimer, delayCalculator(0));
+		};
+
+		//Set the initial timeout with the amount of seconds elapsed as reducedSeconds so it will trigger when the minute changes
+		setTimeout(notificationTimer, delayCalculator(self.second));
 
 		// Set locale.
 		moment.locale(config.language);
-
 	},
 	// Override dom generator.
-	getDom: function() {
-
+	getDom: function () {
 		var wrapper = document.createElement("div");
 
 		/************************************
@@ -62,12 +99,16 @@ Module.register("clock",{
 		var timeWrapper = document.createElement("div");
 		var secondsWrapper = document.createElement("sup");
 		var periodWrapper = document.createElement("span");
-		var weekWrapper = document.createElement("div")
+		var sunWrapper = document.createElement("div");
+		var moonWrapper = document.createElement("div");
+		var weekWrapper = document.createElement("div");
 		// Style Wrappers
 		dateWrapper.className = "date normal medium";
 		timeWrapper.className = "time bright large light";
 		secondsWrapper.className = "dimmed";
-		weekWrapper.className = "week dimmed medium"
+		sunWrapper.className = "sun dimmed small";
+		moonWrapper.className = "moon dimmed small";
+		weekWrapper.className = "week dimmed medium";
 
 		// Set content of wrappers.
 		// The moment().format("h") method has a bug on the Raspberry Pi.
@@ -75,6 +116,7 @@ Module.register("clock",{
 		// See issue: https://github.com/MichMich/MagicMirror/issues/181
 		var timeString;
 		var now = moment();
+		this.lastDisplayedMinute = now.minute();
 		if (this.config.timezone) {
 			now.tz(this.config.timezone);
 		}
@@ -85,12 +127,12 @@ Module.register("clock",{
 		}
 
 		if (this.config.clockBold === true) {
-			timeString = now.format(hourSymbol + "[<span class=\"bold\">]mm[</span>]");
+			timeString = now.format(hourSymbol + '[<span class="bold">]mm[</span>]');
 		} else {
 			timeString = now.format(hourSymbol + ":mm");
 		}
 
-		if(this.config.showDate){
+		if (this.config.showDate) {
 			dateWrapper.innerHTML = now.format(this.config.dateFormat);
 		}
 		if (this.config.showWeek) {
@@ -110,19 +152,79 @@ Module.register("clock",{
 			timeWrapper.appendChild(periodWrapper);
 		}
 
+		function formatTime(config, time) {
+			var formatString = hourSymbol + ":mm";
+			if (config.showPeriod && config.timeFormat !== 24) {
+				formatString += config.showPeriodUpper ? "A" : "a";
+			}
+			return moment(time).format(formatString);
+		}
+		if (this.config.showSunTimes) {
+			const sunTimes = SunCalc.getTimes(now, this.config.lat, this.config.lon);
+			const isVisible = now.isBetween(sunTimes.sunrise, sunTimes.sunset);
+			var nextEvent;
+			if (now.isBefore(sunTimes.sunrise)) {
+				nextEvent = sunTimes.sunrise;
+			} else if (now.isBefore(sunTimes.sunset)) {
+				nextEvent = sunTimes.sunset;
+			} else {
+				const tomorrowSunTimes = SunCalc.getTimes(now.clone().add(1, "day"), this.config.lat, this.config.lon);
+				nextEvent = tomorrowSunTimes.sunrise;
+			}
+			const untilNextEvent = moment.duration(moment(nextEvent).diff(now));
+			const untilNextEventString = untilNextEvent.hours() + "h " + untilNextEvent.minutes() + "m";
+			sunWrapper.innerHTML =
+				'<span class="' +
+				(isVisible ? "bright" : "") +
+				'"><i class="fa fa-sun-o" aria-hidden="true"></i> ' +
+				untilNextEventString +
+				"</span>" +
+				'<span><i class="fa fa-arrow-up" aria-hidden="true"></i>' +
+				formatTime(this.config, sunTimes.sunrise) +
+				"</span>" +
+				'<span><i class="fa fa-arrow-down" aria-hidden="true"></i>' +
+				formatTime(this.config, sunTimes.sunset) +
+				"</span>";
+		}
+		if (this.config.showMoonTimes) {
+			const moonIllumination = SunCalc.getMoonIllumination(now.toDate());
+			const moonTimes = SunCalc.getMoonTimes(now, this.config.lat, this.config.lon);
+			const moonRise = moonTimes.rise;
+			var moonSet;
+			if (moment(moonTimes.set).isAfter(moonTimes.rise)) {
+				moonSet = moonTimes.set;
+			} else {
+				const nextMoonTimes = SunCalc.getMoonTimes(now.clone().add(1, "day"), this.config.lat, this.config.lon);
+				moonSet = nextMoonTimes.set;
+			}
+			const isVisible = now.isBetween(moonRise, moonSet) || moonTimes.alwaysUp === true;
+			const illuminatedFractionString = Math.round(moonIllumination.fraction * 100) + "%";
+			moonWrapper.innerHTML =
+				'<span class="' +
+				(isVisible ? "bright" : "") +
+				'"><i class="fa fa-moon-o" aria-hidden="true"></i> ' +
+				illuminatedFractionString +
+				"</span>" +
+				'<span><i class="fa fa-arrow-up" aria-hidden="true"></i> ' +
+				(moonRise ? formatTime(this.config, moonRise) : "...") +
+				"</span>" +
+				'<span><i class="fa fa-arrow-down" aria-hidden="true"></i> ' +
+				(moonSet ? formatTime(this.config, moonSet) : "...") +
+				"</span>";
+		}
+
 		/****************************************************************
 		 * Create wrappers for ANALOG clock, only if specified in config
 		 */
 
-		 if (this.config.displayType !== "digital") {
+		if (this.config.displayType !== "digital") {
 			// If it isn't 'digital', then an 'analog' clock was also requested
 
 			// Calculate the degree offset for each hand of the clock
-			var now = moment();
 			if (this.config.timezone) {
 				now.tz(this.config.timezone);
 			}
-			var	second = now.seconds() * 6,
+			var second = now.seconds() * 6,
 				minute = now.minute() * 6 + second / 60,
 				hour = ((now.hours() % 12) / 12) * 360 + 90 + minute / 12;
 
@@ -132,14 +234,14 @@ Module.register("clock",{
 			clockCircle.style.width = this.config.analogSize;
 			clockCircle.style.height = this.config.analogSize;
 
-			if (this.config.analogFace != "" && this.config.analogFace != "simple" && this.config.analogFace != "none") {
-				clockCircle.style.background = "url("+ this.data.path + "faces/" + this.config.analogFace + ".svg)";
+			if (this.config.analogFace !== "" && this.config.analogFace !== "simple" && this.config.analogFace !== "none") {
+				clockCircle.style.background = "url(" + this.data.path + "faces/" + this.config.analogFace + ".svg)";
 				clockCircle.style.backgroundSize = "100%";
 
 				// The following line solves issue: https://github.com/MichMich/MagicMirror/issues/611
-				clockCircle.style.border = "1px solid black";
-
-			} else if (this.config.analogFace != "none") {
+				// clockCircle.style.border = "1px solid black";
+				clockCircle.style.border = "rgba(0, 0, 0, 0.1)"; //Updated fix for Issue 611 where non-black backgrounds are used
+			} else if (this.config.analogFace !== "none") {
 				clockCircle.style.border = "2px solid white";
 			}
 			var clockFace = document.createElement("div");
@@ -177,6 +279,8 @@ Module.register("clock",{
 			// Display only a digital clock
 			wrapper.appendChild(dateWrapper);
 			wrapper.appendChild(timeWrapper);
+			wrapper.appendChild(sunWrapper);
+			wrapper.appendChild(moonWrapper);
 			wrapper.appendChild(weekWrapper);
 		} else if (this.config.displayType === "analog") {
 			// Display only an analog clock
@@ -202,20 +306,23 @@ Module.register("clock",{
 			// Both clocks have been configured, check position
 			var placement = this.config.analogPlacement;
 
-			analogWrapper = document.createElement("div");
+			var analogWrapper = document.createElement("div");
 			analogWrapper.id = "analog";
 			analogWrapper.style.cssFloat = "none";
 			analogWrapper.appendChild(clockCircle);
-			digitalWrapper = document.createElement("div");
+
+			var digitalWrapper = document.createElement("div");
 			digitalWrapper.id = "digital";
 			digitalWrapper.style.cssFloat = "none";
 			digitalWrapper.appendChild(dateWrapper);
 			digitalWrapper.appendChild(timeWrapper);
+			digitalWrapper.appendChild(sunWrapper);
+			digitalWrapper.appendChild(moonWrapper);
 			digitalWrapper.appendChild(weekWrapper);
 
-			var appendClocks = function(condition, pos1, pos2) {
-				var padding = [0,0,0,0];
-				padding[(placement === condition) ? pos1 : pos2] = "20px";
+			var appendClocks = function (condition, pos1, pos2) {
+				var padding = [0, 0, 0, 0];
+				padding[placement === condition ? pos1 : pos2] = "20px";
 				analogWrapper.style.padding = padding.join(" ");
 				if (placement === condition) {
 					wrapper.appendChild(analogWrapper);

modules/default/clock/clock_styles.css

@@ -1,68 +1,72 @@
-.clockCircle {
-  margin: 0 auto;
-  position: relative;
-  border-radius: 50%;
-  background-size: 100%;
-}
-
-.clockFace {
-  width: 100%;
-  height: 100%;
-}
-
-.clockFace::after {
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  width: 6px;
-  height: 6px;
-  margin: -3px 0 0 -3px;
-  background: white;
-  border-radius: 3px;
-  content: "";
-  display: block;
-}
-
-.clockHour {
-  width: 0;
-  height: 0;
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  margin: -2px 0 -2px -25%;   /* numbers much match negative length & thickness */
-  padding: 2px 0 2px 25%;     /* indicator length & thickness */
-  background: white;
-  -webkit-transform-origin: 100% 50%;
-  -ms-transform-origin: 100% 50%;
-  transform-origin: 100% 50%;
-  border-radius: 3px 0 0 3px;
-}
-
-.clockMinute {
-  width: 0;
-  height: 0;
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  margin: -35% -2px 0;    /* numbers must match negative length & thickness */
-  padding: 35% 2px 0; /* indicator length & thickness */
-  background: white;
-  -webkit-transform-origin: 50% 100%;
-  -ms-transform-origin: 50% 100%;
-  transform-origin: 50% 100%;
-  border-radius: 3px 0 0 3px;
-}
-
-.clockSecond {
-  width: 0;
-  height: 0;
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  margin: -38% -1px 0 0;  /* numbers must match negative length & thickness */
-  padding: 38% 1px 0 0;   /* indicator length & thickness */
-  background: #888;
-  -webkit-transform-origin: 50% 100%;
-  -ms-transform-origin: 50% 100%;
-  transform-origin: 50% 100%;
-}
+.clockCircle {
+  margin: 0 auto;
+  position: relative;
+  border-radius: 50%;
+  background-size: 100%;
+}
+
+.clockFace {
+  width: 100%;
+  height: 100%;
+}
+
+.clockFace::after {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  width: 6px;
+  height: 6px;
+  margin: -3px 0 0 -3px;
+  background: white;
+  border-radius: 3px;
+  content: "";
+  display: block;
+}
+
+.clockHour {
+  width: 0;
+  height: 0;
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  margin: -2px 0 -2px -25%; /* numbers much match negative length & thickness */
+  padding: 2px 0 2px 25%; /* indicator length & thickness */
+  background: white;
+  transform-origin: 100% 50%;
+  border-radius: 3px 0 0 3px;
+}
+
+.clockMinute {
+  width: 0;
+  height: 0;
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  margin: -35% -2px 0; /* numbers must match negative length & thickness */
+  padding: 35% 2px 0; /* indicator length & thickness */
+  background: white;
+  transform-origin: 50% 100%;
+  border-radius: 3px 0 0 3px;
+}
+
+.clockSecond {
+  width: 0;
+  height: 0;
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  margin: -38% -1px 0 0; /* numbers must match negative length & thickness */
+  padding: 38% 1px 0 0; /* indicator length & thickness */
+  background: #888;
+  transform-origin: 50% 100%;
+}
+
+.module.clock .sun,
+.module.clock .moon {
+  display: flex;
+}
+
+.module.clock .sun > *,
+.module.clock .moon > * {
+  flex: 1;
+}

modules/default/clock/faces/face-001.svg

@@ -1 +1 @@
-<svg id="Hour_Markers_-_Singlets" data-name="Hour Markers - Singlets" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 250 250"><defs><style>.cls-1,.cls-2{fill:none;stroke:#fff;stroke-linecap:round;stroke-miterlimit:10;}.cls-2{stroke-width:0.5px;}</style></defs><title>face-001</title><line class="cls-1" x1="125" y1="1.25" x2="125" y2="16.23"/><line class="cls-1" x1="186.87" y1="17.83" x2="179.39" y2="30.8"/><line class="cls-1" x1="232.17" y1="63.12" x2="219.2" y2="70.61"/><line class="cls-1" x1="248.75" y1="125" x2="233.77" y2="125"/><line class="cls-1" x1="232.17" y1="186.87" x2="219.2" y2="179.39"/><line class="cls-1" x1="186.88" y1="232.17" x2="179.39" y2="219.2"/><line class="cls-1" x1="125" y1="248.75" x2="125" y2="233.77"/><line class="cls-1" x1="63.13" y1="232.17" x2="70.61" y2="219.2"/><line class="cls-1" x1="17.83" y1="186.88" x2="30.8" y2="179.39"/><line class="cls-1" x1="1.25" y1="125" x2="16.23" y2="125"/><line class="cls-1" x1="17.83" y1="63.13" x2="30.8" y2="70.61"/><line class="cls-1" x1="63.12" y1="17.83" x2="70.61" y2="30.8"/><line class="cls-2" x1="138.01" y1="1.25" x2="136.96" y2="11.23"/><line class="cls-2" x1="150.87" y1="3.29" x2="148.78" y2="13.11"/><line class="cls-2" x1="163.45" y1="6.66" x2="160.35" y2="16.21"/><line class="cls-2" x1="175.61" y1="11.33" x2="171.53" y2="20.5"/><line class="cls-2" x1="198.14" y1="24.33" x2="192.24" y2="32.45"/><line class="cls-2" x1="208.26" y1="32.53" x2="201.54" y2="39.99"/><line class="cls-2" x1="217.47" y1="41.74" x2="210.01" y2="48.46"/><line class="cls-2" x1="225.67" y1="51.86" x2="217.55" y2="57.76"/><line class="cls-2" x1="238.67" y1="74.39" x2="229.5" y2="78.47"/><line class="cls-2" x1="243.34" y1="86.55" x2="233.79" y2="89.65"/><line class="cls-2" x1="246.71" y1="99.13" x2="236.89" y2="101.22"/><line class="cls-2" x1="248.75" y1="111.99" x2="238.77" y2="113.04"/><line class="cls-2" x1="248.75" y1="138.01" x2="238.77" y2="136.96"/><line class="cls-2" x1="246.71" y1="150.87" x2="236.89" y2="148.78"/><line class="cls-2" x1="243.34" y1="163.45" x2="233.79" y2="160.35"/><line class="cls-2" x1="238.67" y1="175.61" x2="229.5" y2="171.53"/><line class="cls-2" x1="225.67" y1="198.14" x2="217.55" y2="192.24"/><line class="cls-2" x1="217.47" y1="208.26" x2="210.01" y2="201.54"/><line class="cls-2" x1="208.26" y1="217.47" x2="201.54" y2="210.01"/><line class="cls-2" x1="198.14" y1="225.67" x2="192.24" y2="217.55"/><line class="cls-2" x1="175.61" y1="238.67" x2="171.53" y2="229.5"/><line class="cls-2" x1="163.45" y1="243.34" x2="160.35" y2="233.79"/><line class="cls-2" x1="150.87" y1="246.71" x2="148.78" y2="236.89"/><line class="cls-2" x1="138.01" y1="248.75" x2="136.96" y2="238.77"/><line class="cls-2" x1="111.99" y1="248.75" x2="113.04" y2="238.77"/><line class="cls-2" x1="99.13" y1="246.71" x2="101.22" y2="236.89"/><line class="cls-2" x1="86.55" y1="243.34" x2="89.65" y2="233.79"/><line class="cls-2" x1="74.39" y1="238.67" x2="78.47" y2="229.5"/><line class="cls-2" x1="51.86" y1="225.67" x2="57.76" y2="217.55"/><line class="cls-2" x1="41.74" y1="217.47" x2="48.46" y2="210.01"/><line class="cls-2" x1="32.53" y1="208.26" x2="39.99" y2="201.54"/><line class="cls-2" x1="24.33" y1="198.14" x2="32.45" y2="192.24"/><line class="cls-2" x1="11.33" y1="175.61" x2="20.5" y2="171.53"/><line class="cls-2" x1="6.66" y1="163.45" x2="16.21" y2="160.35"/><line class="cls-2" x1="3.29" y1="150.87" x2="13.11" y2="148.78"/><line class="cls-2" x1="1.25" y1="138.01" x2="11.23" y2="136.96"/><line class="cls-2" x1="1.25" y1="111.99" x2="11.23" y2="113.04"/><line class="cls-2" x1="3.29" y1="99.13" x2="13.11" y2="101.22"/><line class="cls-2" x1="6.66" y1="86.55" x2="16.21" y2="89.65"/><line class="cls-2" x1="11.33" y1="74.39" x2="20.5" y2="78.47"/><line class="cls-2" x1="24.33" y1="51.86" x2="32.45" y2="57.76"/><line class="cls-2" x1="32.53" y1="41.74" x2="39.99" y2="48.46"/><line class="cls-2" x1="41.74" y1="32.53" x2="48.46" y2="39.99"/><line class="cls-2" x1="51.86" y1="24.33" x2="57.76" y2="32.45"/><line class="cls-2" x1="74.39" y1="11.33" x2="78.47" y2="20.5"/><line class="cls-2" x1="86.55" y1="6.66" x2="89.65" y2="16.21"/><line class="cls-2" x1="99.13" y1="3.29" x2="101.22" y2="13.11"/><line class="cls-2" x1="111.99" y1="1.25" x2="113.04" y2="11.23"/></svg>
+<svg id="Hour_Markers_-_Singlets" data-name="Hour Markers - Singlets" xmlns="https://www.w3.org/2000/svg" viewBox="0 0 250 250"><defs><style>.cls-1,.cls-2{fill:none;stroke:#fff;stroke-linecap:round;stroke-miterlimit:10;}.cls-2{stroke-width:0.5px;}</style></defs><title>face-001</title><line class="cls-1" x1="125" y1="1.25" x2="125" y2="16.23"/><line class="cls-1" x1="186.87" y1="17.83" x2="179.39" y2="30.8"/><line class="cls-1" x1="232.17" y1="63.12" x2="219.2" y2="70.61"/><line class="cls-1" x1="248.75" y1="125" x2="233.77" y2="125"/><line class="cls-1" x1="232.17" y1="186.87" x2="219.2" y2="179.39"/><line class="cls-1" x1="186.88" y1="232.17" x2="179.39" y2="219.2"/><line class="cls-1" x1="125" y1="248.75" x2="125" y2="233.77"/><line class="cls-1" x1="63.13" y1="232.17" x2="70.61" y2="219.2"/><line class="cls-1" x1="17.83" y1="186.88" x2="30.8" y2="179.39"/><line class="cls-1" x1="1.25" y1="125" x2="16.23" y2="125"/><line class="cls-1" x1="17.83" y1="63.13" x2="30.8" y2="70.61"/><line class="cls-1" x1="63.12" y1="17.83" x2="70.61" y2="30.8"/><line class="cls-2" x1="138.01" y1="1.25" x2="136.96" y2="11.23"/><line class="cls-2" x1="150.87" y1="3.29" x2="148.78" y2="13.11"/><line class="cls-2" x1="163.45" y1="6.66" x2="160.35" y2="16.21"/><line class="cls-2" x1="175.61" y1="11.33" x2="171.53" y2="20.5"/><line class="cls-2" x1="198.14" y1="24.33" x2="192.24" y2="32.45"/><line class="cls-2" x1="208.26" y1="32.53" x2="201.54" y2="39.99"/><line class="cls-2" x1="217.47" y1="41.74" x2="210.01" y2="48.46"/><line class="cls-2" x1="225.67" y1="51.86" x2="217.55" y2="57.76"/><line class="cls-2" x1="238.67" y1="74.39" x2="229.5" y2="78.47"/><line class="cls-2" x1="243.34" y1="86.55" x2="233.79" y2="89.65"/><line class="cls-2" x1="246.71" y1="99.13" x2="236.89" y2="101.22"/><line class="cls-2" x1="248.75" y1="111.99" x2="238.77" y2="113.04"/><line class="cls-2" x1="248.75" y1="138.01" x2="238.77" y2="136.96"/><line class="cls-2" x1="246.71" y1="150.87" x2="236.89" y2="148.78"/><line class="cls-2" x1="243.34" y1="163.45" x2="233.79" y2="160.35"/><line class="cls-2" x1="238.67" y1="175.61" x2="229.5" y2="171.53"/><line class="cls-2" x1="225.67" y1="198.14" x2="217.55" y2="192.24"/><line class="cls-2" x1="217.47" y1="208.26" x2="210.01" y2="201.54"/><line class="cls-2" x1="208.26" y1="217.47" x2="201.54" y2="210.01"/><line class="cls-2" x1="198.14" y1="225.67" x2="192.24" y2="217.55"/><line class="cls-2" x1="175.61" y1="238.67" x2="171.53" y2="229.5"/><line class="cls-2" x1="163.45" y1="243.34" x2="160.35" y2="233.79"/><line class="cls-2" x1="150.87" y1="246.71" x2="148.78" y2="236.89"/><line class="cls-2" x1="138.01" y1="248.75" x2="136.96" y2="238.77"/><line class="cls-2" x1="111.99" y1="248.75" x2="113.04" y2="238.77"/><line class="cls-2" x1="99.13" y1="246.71" x2="101.22" y2="236.89"/><line class="cls-2" x1="86.55" y1="243.34" x2="89.65" y2="233.79"/><line class="cls-2" x1="74.39" y1="238.67" x2="78.47" y2="229.5"/><line class="cls-2" x1="51.86" y1="225.67" x2="57.76" y2="217.55"/><line class="cls-2" x1="41.74" y1="217.47" x2="48.46" y2="210.01"/><line class="cls-2" x1="32.53" y1="208.26" x2="39.99" y2="201.54"/><line class="cls-2" x1="24.33" y1="198.14" x2="32.45" y2="192.24"/><line class="cls-2" x1="11.33" y1="175.61" x2="20.5" y2="171.53"/><line class="cls-2" x1="6.66" y1="163.45" x2="16.21" y2="160.35"/><line class="cls-2" x1="3.29" y1="150.87" x2="13.11" y2="148.78"/><line class="cls-2" x1="1.25" y1="138.01" x2="11.23" y2="136.96"/><line class="cls-2" x1="1.25" y1="111.99" x2="11.23" y2="113.04"/><line class="cls-2" x1="3.29" y1="99.13" x2="13.11" y2="101.22"/><line class="cls-2" x1="6.66" y1="86.55" x2="16.21" y2="89.65"/><line class="cls-2" x1="11.33" y1="74.39" x2="20.5" y2="78.47"/><line class="cls-2" x1="24.33" y1="51.86" x2="32.45" y2="57.76"/><line class="cls-2" x1="32.53" y1="41.74" x2="39.99" y2="48.46"/><line class="cls-2" x1="41.74" y1="32.53" x2="48.46" y2="39.99"/><line class="cls-2" x1="51.86" y1="24.33" x2="57.76" y2="32.45"/><line class="cls-2" x1="74.39" y1="11.33" x2="78.47" y2="20.5"/><line class="cls-2" x1="86.55" y1="6.66" x2="89.65" y2="16.21"/><line class="cls-2" x1="99.13" y1="3.29" x2="101.22" y2="13.11"/><line class="cls-2" x1="111.99" y1="1.25" x2="113.04" y2="11.23"/></svg>

modules/default/clock/faces/face-002.svg

@@ -1 +1 @@
-<svg id="Hour_Markers_-_Doubles" data-name="Hour Markers - Doubles" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 250 250"><defs><style>.cls-1{fill:none;stroke:#fff;stroke-linecap:round;stroke-miterlimit:10;stroke-width:2.98px;}</style></defs><title>face-002</title><line class="cls-1" x1="122.01" y1="1.75" x2="122.01" y2="16.67"/><line class="cls-1" x1="186.62" y1="18.26" x2="179.17" y2="31.18"/><line class="cls-1" x1="231.74" y1="63.37" x2="218.82" y2="70.83"/><line class="cls-1" x1="248.25" y1="127.99" x2="233.33" y2="127.99"/><line class="cls-1" x1="231.74" y1="186.62" x2="218.82" y2="179.17"/><line class="cls-1" x1="186.63" y1="231.74" x2="179.17" y2="218.82"/><line class="cls-1" x1="127.99" y1="248.25" x2="127.99" y2="233.33"/><line class="cls-1" x1="63.38" y1="231.74" x2="70.83" y2="218.82"/><line class="cls-1" x1="18.26" y1="186.63" x2="31.18" y2="179.17"/><line class="cls-1" x1="1.75" y1="122.01" x2="16.67" y2="122.01"/><line class="cls-1" x1="18.26" y1="63.38" x2="31.18" y2="70.83"/><line class="cls-1" x1="63.37" y1="18.26" x2="70.83" y2="31.18"/><line class="cls-1" x1="127.99" y1="1.75" x2="127.99" y2="16.67"/><line class="cls-1" x1="248.25" y1="122.01" x2="233.33" y2="122.01"/><line class="cls-1" x1="122.01" y1="248.25" x2="122.01" y2="233.33"/><line class="cls-1" x1="1.75" y1="127.99" x2="16.67" y2="127.99"/></svg>
+<svg id="Hour_Markers_-_Doubles" data-name="Hour Markers - Doubles" xmlns="https://www.w3.org/2000/svg" viewBox="0 0 250 250"><defs><style>.cls-1{fill:none;stroke:#fff;stroke-linecap:round;stroke-miterlimit:10;stroke-width:2.98px;}</style></defs><title>face-002</title><line class="cls-1" x1="122.01" y1="1.75" x2="122.01" y2="16.67"/><line class="cls-1" x1="186.62" y1="18.26" x2="179.17" y2="31.18"/><line class="cls-1" x1="231.74" y1="63.37" x2="218.82" y2="70.83"/><line class="cls-1" x1="248.25" y1="127.99" x2="233.33" y2="127.99"/><line class="cls-1" x1="231.74" y1="186.62" x2="218.82" y2="179.17"/><line class="cls-1" x1="186.63" y1="231.74" x2="179.17" y2="218.82"/><line class="cls-1" x1="127.99" y1="248.25" x2="127.99" y2="233.33"/><line class="cls-1" x1="63.38" y1="231.74" x2="70.83" y2="218.82"/><line class="cls-1" x1="18.26" y1="186.63" x2="31.18" y2="179.17"/><line class="cls-1" x1="1.75" y1="122.01" x2="16.67" y2="122.01"/><line class="cls-1" x1="18.26" y1="63.38" x2="31.18" y2="70.83"/><line class="cls-1" x1="63.37" y1="18.26" x2="70.83" y2="31.18"/><line class="cls-1" x1="127.99" y1="1.75" x2="127.99" y2="16.67"/><line class="cls-1" x1="248.25" y1="122.01" x2="233.33" y2="122.01"/><line class="cls-1" x1="122.01" y1="248.25" x2="122.01" y2="233.33"/><line class="cls-1" x1="1.75" y1="127.99" x2="16.67" y2="127.99"/></svg>