From 81aca500b39377ac31c93f268fedcc94319c8ec3 Mon Sep 17 00:00:00 2001 From: BeatIdo Date: Fri, 10 Mar 2017 16:56:28 +0100 Subject: [PATCH 1/4] Hide News Feed loading option Configuration option to hide News Feed module if feed is empty instead of showing LOADING status --- modules/default/newsfeed/newsfeed.js | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/modules/default/newsfeed/newsfeed.js b/modules/default/newsfeed/newsfeed.js index 7c31717a..c2f53d85 100644 --- a/modules/default/newsfeed/newsfeed.js +++ b/modules/default/newsfeed/newsfeed.js @@ -21,6 +21,7 @@ Module.register("newsfeed",{ showSourceTitle: true, showPublishDate: true, showDescription: false, + hideLoading: false, reloadInterval: 5 * 60 * 1000, // every 5 minutes updateInterval: 10 * 1000, animationSpeed: 2.5 * 1000, @@ -179,12 +180,18 @@ Module.register("newsfeed",{ fullArticle.src = this.newsItems[this.activeItem].url; wrapper.appendChild(fullArticle); } - - - + + if (this.config.hideLoading) { + this.show(); + } + } else { - wrapper.innerHTML = this.translate("LOADING"); - wrapper.className = "small dimmed"; + if (this.config.hideLoading) { + this.hide(); + } else { + wrapper.innerHTML = this.translate("LOADING"); + wrapper.className = "small dimmed"; + } } return wrapper; From 0f27d646bb44702117f9b69f3e1e1b7ea705bd42 Mon Sep 17 00:00:00 2001 From: BeatIdo Date: Fri, 10 Mar 2017 17:03:14 +0100 Subject: [PATCH 2/4] removed trailing spaces --- modules/default/newsfeed/newsfeed.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/default/newsfeed/newsfeed.js b/modules/default/newsfeed/newsfeed.js index c2f53d85..e62888dc 100644 --- a/modules/default/newsfeed/newsfeed.js +++ b/modules/default/newsfeed/newsfeed.js @@ -180,11 +180,11 @@ Module.register("newsfeed",{ fullArticle.src = this.newsItems[this.activeItem].url; wrapper.appendChild(fullArticle); } - + if (this.config.hideLoading) { this.show(); } - + } else { if (this.config.hideLoading) { this.hide(); From 44509e027c4e383683ef2efe79ec905b7ded99c1 Mon Sep 17 00:00:00 2001 From: BeatIdo Date: Fri, 17 Mar 2017 09:06:29 +0100 Subject: [PATCH 3/4] Add hideLoading option description --- modules/default/newsfeed/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/default/newsfeed/README.md b/modules/default/newsfeed/README.md index bfaa1aad..fabe73d3 100644 --- a/modules/default/newsfeed/README.md +++ b/modules/default/newsfeed/README.md @@ -63,6 +63,7 @@ The following properties can be configured: | `showSourceTitle` | Display the title of the source.

**Possible values:** `true` or `false`
**Default value:** `true` | `showPublishDate` | Display the publish date of an headline.

**Possible values:** `true` or `false`
**Default value:** `true` | `showDescription` | Display the description of an item.

**Possible values:** `true` or `false`
**Default value:** `false` +| `hideLoading` | Hide module instead of showing LOADING status.

**Possible values:** `true` or `false`
**Default value:** `false` | `reloadInterval` | How often does the content needs to be fetched? (Milliseconds)

**Possible values:** `1000` - `86400000`
**Default value:** `300000` (5 minutes) | `updateInterval` | How often do you want to display a new headline? (Milliseconds)

**Possible values:**`1000` - `60000`
**Default value:** `10000` (10 seconds) | `animationSpeed` | Speed of the update animation. (Milliseconds)

**Possible values:**`0` - `5000`
**Default value:** `2500` (2.5 seconds) From 1f5ea40bf68b496867514378d16939bc974ace7d Mon Sep 17 00:00:00 2001 From: BeatIdo Date: Fri, 17 Mar 2017 09:08:45 +0100 Subject: [PATCH 4/4] News Feed hideLoading option --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 564564cb..4a0d1212 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -49,6 +49,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Korean Translation. - Added console warning on startup when deprecated config options are used - Added `DAYAFTERTOMORROW`, `UPDATE_NOTIFICATION`, `UPDATE_NOTIFICATION_MODULE`, `UPDATE_INFO` to Norwegian translations (`nn` and `nb`). +- Added hideLoading option for News Feed module ### Fixed - Update .gitignore to not ignore default modules folder.