diff --git a/MMM-pages.js b/MMM-pages.js index 7e1ece5..712315d 100644 --- a/MMM-pages.js +++ b/MMM-pages.js @@ -12,6 +12,7 @@ Module.register('MMM-pages', { hiddenPages: {}, animationTime: 1000, rotationTime: 0, + timings: { default: 0 }, rotationFirstPage: 0, // Keep for compatibility rotationHomePage: 0, rotationDelay: 10000, @@ -52,8 +53,13 @@ Module.register('MMM-pages', { this.config.rotationHomePage = this.config.rotationFirstPage; } + if (this.config.rotationTime) { + Log.warn('[MMM-pages] The config option "rotationTime" is deprecated. Please used "rotationHomePage" instead.'); + this.config.timings.default = this.config.rotationTime; + } + // Disable rotation if an invalid input is given - this.config.rotationTime = Math.max(this.config.rotationTime, 0); + this.config.timings.default = Math.max(this.config.timings.default, 0); this.config.rotationDelay = Math.max(this.config.rotationDelay, 0); this.config.rotationHomePage = Math.max(this.config.rotationHomePage, 0); @@ -221,11 +227,15 @@ Module.register('MMM-pages', { * @param {number} delay the delay, in milliseconds. */ resetTimerWithDelay(delay) { - if (this.config.rotationTime > 0) { + if (this.config.timings.default > 0 || Object.keys(this.config.timings).length > 1) { // This timer is the auto rotate function. clearInterval(this.timer); // This is delay timer after manually updating. clearInterval(this.delayTimer); + let currentRotationTime = this.config.timings.default; + if (this.config.timings[this.curPage]) { + currentRotationTime = this.config.timings[this.curPage]; + } const self = this; this.delayTimer = setTimeout(() => { @@ -235,7 +245,7 @@ Module.register('MMM-pages', { // message, so we need to trigger it for ourselves. self.sendNotification('PAGE_INCREMENT'); self.notificationReceived('PAGE_INCREMENT'); - }, self.config.rotationTime); + }, currentRotationTime); }, delay); } else if (this.config.rotationHomePage > 0) { // This timer is the auto rotate function. diff --git a/README.md b/README.md index 29394ef..793d156 100644 --- a/README.md +++ b/README.md @@ -158,14 +158,15 @@ You have to add the class name to the config of the module you want to show on a ### Configuration options -| Option | Type | Default Value | Description | -| --- | --- | --- | --- | +| Option | Type | Default Value | Description | +| ------------------- | -------------------------- | ------------------------ | ----------- | | `modules` | `[[String...]...]` | `[]` | A 2D String array of what each module should be on which page. Note that all entries must take their class name (e.g. this module's class name is `MMM-pages`, while the default modules may just have `newsfeed`, without the `MMM-` prefix. | | `fixed` | `[String...]` | `["MMM-page-indicator"]` | Which modules should show up all the time. | | `excludes` | *NA* | *NA* | **Deprecated**. Use `fixed` instead. | | `hiddenPages` | `{String: [String...]...}` | `{}` | An Object defining special `hiddenPages` which are not available on the normal page rotation and only accessible via a notification. Modules defined in `fixed` are ignored and need to be also added if you wish to have them on any hidden page. | | `animationTime` | `int` | `1000` | Fading animation time. Set to `0` for instant change. Value is in milliseconds (1 second = 1000 milliseconds). | -| `rotationTime` | `int` | `0` | Time, in milliseconds, between automatic page changes. | +| `rotationTime` | `int` | `0` | **Deprecated**. Use `timings` instead. | +| `timings` | `object` | `{ default: 0 }` | An object whose keys define the rotation time of the pages in milliseconds.
Example, where each page is 3 seconds, except page 3 which is 20 seconds:
`{ default: 3000, 2: 20000 }`
If a page is not defined, it will use the `default` value.
*Note:* Remember that the numbering starts at 0, so the first page is `0`, the second page is `1`, and so forth. | | `rotationDelay` | `int` | `10000` | Time, in milliseconds, of how long should a manual page change linger before returning to automatic page changing. In other words, how long should the timer wait for after you manually change a page. This does include the animation time, so you may wish to increase it by a few seconds or so to account for the animation time. | | `rotationHomePage` | `int` | `0` | Time, in milliseconds, before automatically returning to the home page. If a home page is not set, this returns to the leftmost page instead. | | `rotationFirstPage` | *NA* | *NA* | **Deprecated**. Use `rotationHomePage` instead. |