Trim whitespace in newsfeed title

MagicMirrorOrg · May 24, 2023 · 12d617c · 12d617c
1 parent 91065d6
commit 12d617c
Showing 1 changed file with 5 additions and 15 deletions.
diff --git a/modules/default/newsfeed/newsfeed.njk b/modules/default/newsfeed/newsfeed.njk
@@ -1,9 +1,9 @@
 {% macro escapeText(text, dangerouslyDisableAutoEscaping=false) %}
-    {% if dangerouslyDisableAutoEscaping %}
+    {% if dangerouslyDisableAutoEscaping -%}
         {{ text | safe }}
-    {% else %}
+    {%- else -%}
         {{ text }}
-    {% endif %}
+    {%- endif %}
 {% endmacro %}
 {% macro escapeTitle(title, url, dangerouslyDisableAutoEscaping=false, showTitleAsUrl=false) %}
     {% if dangerouslyDisableAutoEscaping %}
@@ -34,12 +34,7 @@
                     {% 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 %}
+                                {{ item.sourceTitle }}{% if config.showPublishDate %}, {% else %}:{% endif %}
                             {% endif %}
                             {% if config.showPublishDate %}{{ item.publishDate }}:{% endif %}
                         </div>
@@ -64,12 +59,7 @@
             {% if (config.showSourceTitle and sourceTitle) or config.showPublishDate %}
                 <div class="newsfeed-source light small dimmed">
                     {% if sourceTitle and config.showSourceTitle %}
-                        {{ escapeText(sourceTitle, config.dangerouslyDisableAutoEscaping) }}
-                        {% if config.showPublishDate %}
-                            ,
-                        {% else %}
-                            :
-                        {% endif %}
+                        {{ escapeText(sourceTitle, config.dangerouslyDisableAutoEscaping) }}{% if config.showPublishDate %}, {% else %}:{% endif %}
                     {% endif %}
                     {% if config.showPublishDate %}{{ publishDate }}:{% endif %}
                 </div>