kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-28 20:22:53 +00:00
Code Issues Projects Releases Wiki Activity

Moves validation into template

Browse Source
This commit is contained in:
oemel09 2021-04-08 16:48:29 +02:00
parent 256d5ae14f
commit a49962b8de
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/default/newsfeed/newsfeed.js
View File

@ -135,7 +135,7 @@ 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: this.isShowingDescription ? item.description : null description: item.description
}; };
}, },

16
modules/default/newsfeed/newsfeed.njk
View File

@ -13,13 +13,15 @@
<div class="newsfeed-title bright medium light{{ ' no-wrap' if not config.wrapTitle }}"> <div class="newsfeed-title bright medium light{{ ' no-wrap' if not config.wrapTitle }}">
{{ title }} {{ title }}
</div> </div>
<div class="newsfeed-desc small light{{ ' no-wrap' if not config.wrapDescription }}"> {% if (config.showDescription) %}
{% if config.truncDescription %} <div class="newsfeed-desc small light{{ ' no-wrap' if not config.wrapDescription }}">
{{ description | truncate(config.lengthDescription) }} {% if config.truncDescription %}
{% else %} {{ description | truncate(config.lengthDescription) }}
{{ description }} {% else %}
{% endif %} {{ description }}
</div> {% endif %}
</div>
{% endif %}
</div> </div>
{% elseif error %} {% elseif error %}
<div class="small dimmed"> <div class="small dimmed">