From 45cb770e41cbdd4a4af9501a7b8ccb3289d31e73 Mon Sep 17 00:00:00 2001 From: yo-less Date: Fri, 26 Aug 2016 22:06:03 +0200 Subject: [PATCH 1/6] Added option to remove "more" tags in description Many feed descriptions end with with a link tag to the actual article online (see http://www.deutschlandfunk.de/die-nachrichten.353.de.rss, for example). The mirror news description looks strange with this tag in the end. I have added an option to remove the tag from the description and updated the readme.md accordingly. --- modules/default/newsfeed/README.md | 15 ++++++++++++++- modules/default/newsfeed/newsfeed.js | 15 +++++++++++++-- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/modules/default/newsfeed/README.md b/modules/default/newsfeed/README.md index 882ef94a..365d8a6e 100644 --- a/modules/default/newsfeed/README.md +++ b/modules/default/newsfeed/README.md @@ -108,7 +108,20 @@ The following properties can be configured:
Default value: 0 - + + showMore + Remove "more..." tags from the end of the item description.
+
Possible values:true or false +
Default value: false + + + + moreTag + Specify the exact wording of the "more..." tag.
+
Possible values: 'YOUR_MORE_TAG_HERE' +
Default value: '' + + diff --git a/modules/default/newsfeed/newsfeed.js b/modules/default/newsfeed/newsfeed.js index a9664085..5a6c8b70 100644 --- a/modules/default/newsfeed/newsfeed.js +++ b/modules/default/newsfeed/newsfeed.js @@ -24,7 +24,9 @@ Module.register("newsfeed",{ reloadInterval: 5 * 60 * 1000, // every 5 minutes updateInterval: 10 * 1000, animationSpeed: 2.5 * 1000, - maxNewsItems: 0 // 0 for unlimited + maxNewsItems: 0, // 0 for unlimited + more: false, + moreTag: 'more' }, // Define required scripts. @@ -100,7 +102,16 @@ Module.register("newsfeed",{ title.className = "bright medium light"; title.innerHTML = this.newsItems[this.activeItem].title; wrapper.appendChild(title); - + + //Remove "more" tag from description of rss feeds + + if (this.config.showMore) { + if (this.newsItems[this.activeItem].description.slice(-this.config.moreTag.length)==this.config.moreTag) { + this.newsItems[this.activeItem].description = this.newsItems[this.activeItem].description.slice(0,-this.config.moreTag.length); + } + } + + if (this.config.showDescription) { var description = document.createElement("div"); description.className = "small light"; From e720efabdcbd9b99bb726d97c378a80588d2ae52 Mon Sep 17 00:00:00 2001 From: yo-less Date: Fri, 26 Aug 2016 22:08:23 +0200 Subject: [PATCH 2/6] Updated readme.md / Included more tag --- modules/default/newsfeed/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/default/newsfeed/README.md b/modules/default/newsfeed/README.md index 365d8a6e..e2a4c6f1 100644 --- a/modules/default/newsfeed/README.md +++ b/modules/default/newsfeed/README.md @@ -119,7 +119,7 @@ The following properties can be configured: moreTag Specify the exact wording of the "more..." tag.

Possible values: 'YOUR_MORE_TAG_HERE' -
Default value: '' +
Default value: 'more' From 6f104f505609c13637a3182d10f6ea29a4111331 Mon Sep 17 00:00:00 2001 From: yo-less Date: Sat, 27 Aug 2016 00:32:47 +0200 Subject: [PATCH 3/6] Allow for the removal of feed tags User-specified feed tags in description and title can be removed --- modules/default/newsfeed/README.md | 33 +++++++++++---- modules/default/newsfeed/newsfeed.js | 61 ++++++++++++++++++++++------ 2 files changed, 73 insertions(+), 21 deletions(-) diff --git a/modules/default/newsfeed/README.md b/modules/default/newsfeed/README.md index e2a4c6f1..12fe8e7c 100644 --- a/modules/default/newsfeed/README.md +++ b/modules/default/newsfeed/README.md @@ -108,18 +108,35 @@ The following properties can be configured:
Default value: 0 + removeStartTags: false, + removeEndTags: false, + startTags: [], + endTags: [] + + - showMore - Remove "more..." tags from the end of the item description.
-
Possible values:true or false -
Default value: false + removeStartTags + Some newsfeeds feature tags at the beginning of their titles or descriptions, such as "[VIDEO]". + This setting allows for the removal of specified tags from the beginning of an item's description and / or title.
+
Possible values:'none',description, title, both - moreTag - Specify the exact wording of the "more..." tag.
-
Possible values: 'YOUR_MORE_TAG_HERE' -
Default value: 'more' + startTags + List the tags you would like to have removed at the beginning of the feed item
+
Possible values: ['TAG'] or ['TAG1','TAG2',...] + + + + removeEndTags + Remove specified tags from the end of an item's description and / or title.
+
Possible values:description, title, both + + + + endTags + List the tags you would like to have removed at the end of the feed item
+
Possible values: ['TAG'] or ['TAG1','TAG2',...] diff --git a/modules/default/newsfeed/newsfeed.js b/modules/default/newsfeed/newsfeed.js index 5a6c8b70..a61ba640 100644 --- a/modules/default/newsfeed/newsfeed.js +++ b/modules/default/newsfeed/newsfeed.js @@ -25,8 +25,11 @@ Module.register("newsfeed",{ updateInterval: 10 * 1000, animationSpeed: 2.5 * 1000, maxNewsItems: 0, // 0 for unlimited - more: false, - moreTag: 'more' + removeStartTags: false, + removeEndTags: false, + startTags: [], + endTags: [] + }, // Define required scripts. @@ -98,20 +101,50 @@ Module.register("newsfeed",{ wrapper.appendChild(sourceAndTimestamp); } + //Remove selected tags from the beginning of rss feed items (title or description) + + if (this.config.removeStartTags) { + + for (f=0; f Date: Sat, 27 Aug 2016 00:35:27 +0200 Subject: [PATCH 4/6] Allow for removal of feed tags Updated README.md for legibility --- modules/default/newsfeed/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/default/newsfeed/README.md b/modules/default/newsfeed/README.md index 12fe8e7c..1815e567 100644 --- a/modules/default/newsfeed/README.md +++ b/modules/default/newsfeed/README.md @@ -116,8 +116,8 @@ The following properties can be configured: removeStartTags - Some newsfeeds feature tags at the beginning of their titles or descriptions, such as "[VIDEO]". - This setting allows for the removal of specified tags from the beginning of an item's description and / or title.
+ Some newsfeeds feature tags at the beginning of their titles or descriptions, such as VIDEO. + This setting allows for the removal of specified tags from the beginning of an item's description and/or title.

Possible values:'none',description, title, both @@ -129,7 +129,7 @@ The following properties can be configured: removeEndTags - Remove specified tags from the end of an item's description and / or title.
+ Remove specified tags from the end of an item's description and/or title.

Possible values:description, title, both From 43a0829f44aa64a6edb45831ed4b25d8af2b41ff Mon Sep 17 00:00:00 2001 From: yo-less Date: Sat, 27 Aug 2016 00:37:19 +0200 Subject: [PATCH 5/6] Allow for the removal of feed tags legibility update --- modules/default/newsfeed/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/default/newsfeed/README.md b/modules/default/newsfeed/README.md index 1815e567..a8ac40dd 100644 --- a/modules/default/newsfeed/README.md +++ b/modules/default/newsfeed/README.md @@ -116,7 +116,7 @@ The following properties can be configured: removeStartTags - Some newsfeeds feature tags at the beginning of their titles or descriptions, such as VIDEO. + Some newsfeeds feature tags at the beginning of their titles or descriptions, such as [VIDEO]. This setting allows for the removal of specified tags from the beginning of an item's description and/or title.

Possible values:'none',description, title, both @@ -124,7 +124,7 @@ The following properties can be configured: startTags List the tags you would like to have removed at the beginning of the feed item
-
Possible values: ['TAG'] or ['TAG1','TAG2',...] +
Possible values: ['TAG'] or ['TAG1','TAG2',...] @@ -136,7 +136,7 @@ The following properties can be configured: endTags List the tags you would like to have removed at the end of the feed item
-
Possible values: ['TAG'] or ['TAG1','TAG2',...] +
Possible values: ['TAG'] or ['TAG1','TAG2',...] From c427050a92be5c2fea16281c91798260b62a4049 Mon Sep 17 00:00:00 2001 From: yo-less Date: Sat, 27 Aug 2016 01:16:31 +0200 Subject: [PATCH 6/6] Allow for the removal of feed tags Added options: both, description, title --- modules/default/newsfeed/newsfeed.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/modules/default/newsfeed/newsfeed.js b/modules/default/newsfeed/newsfeed.js index a61ba640..7d8d08c7 100644 --- a/modules/default/newsfeed/newsfeed.js +++ b/modules/default/newsfeed/newsfeed.js @@ -25,8 +25,8 @@ Module.register("newsfeed",{ updateInterval: 10 * 1000, animationSpeed: 2.5 * 1000, maxNewsItems: 0, // 0 for unlimited - removeStartTags: false, - removeEndTags: false, + removeStartTags: '', + removeEndTags: '', startTags: [], endTags: [] @@ -103,7 +103,7 @@ Module.register("newsfeed",{ //Remove selected tags from the beginning of rss feed items (title or description) - if (this.config.removeStartTags) { + if (this.config.removeStartTags == 'title' || 'both') { for (f=0; f