eric/WeatherStar4000
1
0
Fork 0
mirror of https://github.com/netbymatt/ws4kp.git synced 2026-04-22 11:39:30 -07:00
Code Issues Packages Projects Releases Wiki Activity

add hazards before custom scroll options close #149

Browse Source
This commit is contained in:
Matt Walsh
2025-10-17 00:35:26 +00:00
parent 9a5efe9d48
commit f4a1a3a1d8
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
server/scripts/modules/currentweatherscroll.mjs
View File

@@ -298,4 +298,5 @@ export {
hide, hide,
screenCount, screenCount,
atDefault, atDefault,
hazards,
}; };

7
server/scripts/modules/custom-rss-feed.mjs
View File

@@ -1,5 +1,5 @@
import Setting from './utils/setting.mjs'; import Setting from './utils/setting.mjs';
import { reset as resetScroll, addScreen as addScroll } from './currentweatherscroll.mjs'; import { reset as resetScroll, addScreen as addScroll, hazards } from './currentweatherscroll.mjs';
import { json } from './utils/fetch.mjs'; import { json } from './utils/fetch.mjs';
let firstRun = true; let firstRun = true;
@@ -42,8 +42,9 @@ const parseFeed = (textInput) => {
return; return;
} }
// add single text scroll // add single text scroll after hazards if present
resetScroll(); resetScroll();
addScroll(hazards);
addScroll( addScroll(
() => ( () => (
{ {
@@ -81,6 +82,8 @@ const getFeed = async (url) => {
// reset the scroll, then add the screens // reset the scroll, then add the screens
resetScroll(); resetScroll();
// add the hazards scroll first
addScroll(hazards);
titles.forEach((title) => { titles.forEach((title) => {
// data is provided to the screen handler, so we return a function // data is provided to the screen handler, so we return a function
addScroll( addScroll(