kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-12-12 01:42:19 +00:00
Code Issues Projects Releases Wiki Activity

[newsfeed] fix header layout issue (#3946)

Browse Source 
... fixes #3944 introduced with prettier njk linting

---------

Co-authored-by: veeck <gitkraken@veeck.de>
Co-authored-by: Kristjan ESPERANTO <35647502+KristjanESPERANTO@users.noreply.github.com>
This commit is contained in:
Veeck
2025-11-05 18:09:30 +01:00
committed by GitHub
parent 9d713ffd69
commit 034f3c4b2a
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -33,6 +33,7 @@ planned for 2026-01-01
- [core] refactor: replace `express-ipfilter` with lightweight custom middleware (#3917) - This fixes security issue [CVE-2023-42282](https://github.com/advisories/GHSA-78xj-cgh5-2h22), which is not very likely to be exploitable in MagicMirror² setups, but still should be fixed. - [core] refactor: replace `express-ipfilter` with lightweight custom middleware (#3917) - This fixes security issue [CVE-2023-42282](https://github.com/advisories/GHSA-78xj-cgh5-2h22), which is not very likely to be exploitable in MagicMirror² setups, but still should be fixed.
- fixed the Environment Canada weather URL (#3912) and now converts a windspeed of 'calm' to 0 - fixed the Environment Canada weather URL (#3912) and now converts a windspeed of 'calm' to 0
- fixed problems with daylight-saving-time in weather provider `openmeto` (#3930, #3931) - fixed problems with daylight-saving-time in weather provider `openmeto` (#3930, #3931)
- [newsfeed] fixed header layout issue introduced with prettier njk linting (#3946)
### Updated ### Updated

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

@@ -40,7 +40,7 @@
{% if (config.showSourceTitle and item.sourceTitle) or config.showPublishDate %} {% if (config.showSourceTitle and item.sourceTitle) or config.showPublishDate %}
<div class="newsfeed-source light small dimmed"> <div class="newsfeed-source light small dimmed">
{% if item.sourceTitle and config.showSourceTitle %} {% if item.sourceTitle and config.showSourceTitle %}
{{ item.sourceTitle }}{% if config.showPublishDate %},{% else %}:{% endif %} {{ item.sourceTitle }}{% if config.showPublishDate %},&nbsp;{% else %}:{% endif %}
{% endif %} {% endif %}
{% if config.showPublishDate %}{{ item.publishDate }}:{% endif %} {% if config.showPublishDate %}{{ item.publishDate }}:{% endif %}
</div> </div>
@@ -63,7 +63,7 @@
{% 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">
{% if sourceTitle and config.showSourceTitle %} {% if sourceTitle and config.showSourceTitle %}
{{ escapeText(sourceTitle, config.dangerouslyDisableAutoEscaping) }}{% if config.showPublishDate %},{% else %}:{% endif %} {{ escapeText(sourceTitle, config.dangerouslyDisableAutoEscaping) }}{% if config.showPublishDate %},&nbsp;{% else %}:{% endif %}
{% endif %} {% endif %}
{% if config.showPublishDate %}{{ publishDate }}:{% endif %} {% if config.showPublishDate %}{{ publishDate }}:{% endif %}
</div> </div>

5
tests/electron/env_spec.js
View File

@@ -11,8 +11,9 @@ describe("Electron app environment", () => {
}); });
it("should open browserwindow", async () => { it("should open browserwindow", async () => {
const module = await helpers.getElement("#module_0_helloworld"); // Wait for module content to be rendered, not just the module wrapper
await expect(module.textContent()).resolves.toContain("Test Display Header"); const moduleContent = await helpers.getElement("#module_0_helloworld .module-content");
await expect(moduleContent.textContent()).resolves.toContain("Test Display Header");
expect(global.electronApp.windows()).toHaveLength(1); expect(global.electronApp.windows()).toHaveLength(1);
}); });
}); });