diff --git a/CHANGELOG.md b/CHANGELOG.md
index d48a7faf..f1abd8a4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
### 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'.
+- Added ability to turn off the date display in `clock.js` when in analog mode.
## [2.0.3] - 2016-07-12
### Added
diff --git a/js/module.js b/js/module.js
index 9ee13e4c..6f7f9686 100644
--- a/js/module.js
+++ b/js/module.js
@@ -114,7 +114,7 @@ var Module = Class.extend({
* This method is called when a module is hidden.
*/
suspend: function() {
- Log.log(this.name + " is suspend.");
+ Log.log(this.name + " is suspended.");
},
/* resume()
diff --git a/modules/default/clock/README.md b/modules/default/clock/README.md
index 77eb3fde..c7ec6bcb 100644
--- a/modules/default/clock/README.md
+++ b/modules/default/clock/README.md
@@ -101,5 +101,12 @@ The following properties can be configured:
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.
+ Possible values: false , top , or bottom
+ Default value: top
+ |
+
diff --git a/modules/default/clock/clock.js b/modules/default/clock/clock.js
index 9f4abecb..e3415375 100644
--- a/modules/default/clock/clock.js
+++ b/modules/default/clock/clock.js
@@ -19,7 +19,8 @@ Module.register("clock",{
/* specific to the analog clock */
analogSize: '200px',
analogFace: 'simple', // options: 'none', 'simple', 'face-###' (where ### is 001 to 012 inclusive)
- analogPlacement: 'bottom', // options: top, bottom, left, right
+ analogPlacement: 'bottom', // options: 'top', 'bottom', 'left', 'right'
+ analogShowDate: 'top', // options: false, 'top', or 'bottom'
secondsColor: '#888888',
},
// Define required scripts.
@@ -170,8 +171,15 @@ Module.register("clock",{
// Display only an analog clock
dateWrapper.style.textAlign = "center";
dateWrapper.style.paddingBottom = "15px";
- wrapper.appendChild(dateWrapper);
- wrapper.appendChild(clockCircle);
+ if (this.config.analogShowDate === 'top') {
+ wrapper.appendChild(dateWrapper);
+ wrapper.appendChild(clockCircle);
+ } else if (this.config.analogShowDate === 'bottom') {
+ wrapper.appendChild(clockCircle);
+ wrapper.appendChild(dateWrapper);
+ } else {
+ wrapper.appendChild(clockCircle);
+ }
} else {
// Both clocks have been configured, check position
var placement = this.config.analogPlacement;