mirror of
https://github.com/MichMich/MagicMirror.git
synced 2025-06-28 20:22:53 +00:00
server data for newsfeed list.
This commit is contained in:
parent
491f5aa776
commit
aa3a3bdf16
@ -14,6 +14,7 @@ Module.register("newsfeed", {
|
|||||||
encoding: "UTF-8" //ISO-8859-1
|
encoding: "UTF-8" //ISO-8859-1
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
showAsList: true,
|
||||||
showSourceTitle: true,
|
showSourceTitle: true,
|
||||||
showPublishDate: true,
|
showPublishDate: true,
|
||||||
broadcastNewsFeeds: true,
|
broadcastNewsFeeds: true,
|
||||||
@ -135,7 +136,8 @@ Module.register("newsfeed", {
|
|||||||
sourceTitle: item.sourceTitle,
|
sourceTitle: item.sourceTitle,
|
||||||
publishDate: moment(new Date(item.pubdate)).fromNow(),
|
publishDate: moment(new Date(item.pubdate)).fromNow(),
|
||||||
title: item.title,
|
title: item.title,
|
||||||
description: item.description
|
description: item.description,
|
||||||
|
items: this.newsItems
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
|
||||||
@ -192,7 +194,6 @@ Module.register("newsfeed", {
|
|||||||
return true;
|
return true;
|
||||||
}, this);
|
}, this);
|
||||||
}
|
}
|
||||||
|
|
||||||
newsItems.forEach((item) => {
|
newsItems.forEach((item) => {
|
||||||
//Remove selected tags from the beginning of rss feed items (title or description)
|
//Remove selected tags from the beginning of rss feed items (title or description)
|
||||||
if (this.config.removeStartTags === "title" || this.config.removeStartTags === "both") {
|
if (this.config.removeStartTags === "title" || this.config.removeStartTags === "both") {
|
||||||
@ -246,6 +247,7 @@ Module.register("newsfeed", {
|
|||||||
this.sendNotification("NEWS_FEED_UPDATE", { items: updatedItems });
|
this.sendNotification("NEWS_FEED_UPDATE", { items: updatedItems });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Log.warn(newsItems);
|
||||||
this.newsItems = newsItems;
|
this.newsItems = newsItems;
|
||||||
},
|
},
|
||||||
|
|
||||||
|
@ -1,4 +1,33 @@
|
|||||||
{% if loaded %}
|
{% if loaded %}
|
||||||
|
{% if config.showAsList %}
|
||||||
|
<ul class="newsfeed-list">
|
||||||
|
{% for item in items %}
|
||||||
|
<li>
|
||||||
|
{% if (config.showSourceTitle and item.sourceTitle) or config.showPublishDate %}
|
||||||
|
<div class="newsfeed-source light small dimmed">
|
||||||
|
{% if item.sourceTitle and config.showSourceTitle %}
|
||||||
|
{{ item.sourceTitle }}{% if config.showPublishDate %}, {% else %}: {% endif %}
|
||||||
|
{% endif %}
|
||||||
|
{% if config.showPublishDate %}
|
||||||
|
{{ item.publishDate }}:
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
<div class="newsfeed-title bright medium light{{ ' no-wrap' if not config.wrapTitle }}">
|
||||||
|
{{ item.title }}
|
||||||
|
</div>
|
||||||
|
<div class="newsfeed-desc small light{{ ' no-wrap' if not config.wrapDescription }}">
|
||||||
|
{% if config.truncDescription %}
|
||||||
|
{{ item.description | truncate(config.lengthDescription) }}
|
||||||
|
{% else %}
|
||||||
|
{{ item.description }}
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</li>
|
||||||
|
{% endfor %}
|
||||||
|
</ul>
|
||||||
|
{% else %}
|
||||||
<div>
|
<div>
|
||||||
{% if (config.showSourceTitle and sourceTitle) or config.showPublishDate %}
|
{% if (config.showSourceTitle and sourceTitle) or config.showPublishDate %}
|
||||||
<div class="newsfeed-source light small dimmed">
|
<div class="newsfeed-source light small dimmed">
|
||||||
@ -21,6 +50,7 @@
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
{% endif %}
|
||||||
{% elseif error %}
|
{% elseif error %}
|
||||||
<div class="small dimmed">
|
<div class="small dimmed">
|
||||||
{{ "MODULE_CONFIG_ERROR" | translate({MODULE_NAME: "Newsfeed", ERROR: error}) | safe }}
|
{{ "MODULE_CONFIG_ERROR" | translate({MODULE_NAME: "Newsfeed", ERROR: error}) | safe }}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user