h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2025-12-22 07:24:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix HW Button pages

Browse Source
This commit is contained in:
britzelpuf
2022-04-15 11:00:06 +02:00
parent 559e0bfa9f
commit 5b72676c11
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ioBroker/NsPanelTs.ts
View File

@@ -170,6 +170,8 @@ function HandleMessage(typ: string, method: string, page: number, words: Array<s
break; break;
case "sleepReached": case "sleepReached":
screensaverEnabled = true; screensaverEnabled = true;
if(pageId < 0)
pageId = 0;
HandleScreensaver(); HandleScreensaver();
break; break;
case "pageOpenDetail": case "pageOpenDetail":
@@ -210,19 +212,16 @@ function HandleHardwareButton(method: string): void {
let page: (PageThermo | PageEntities | PageGrid); let page: (PageThermo | PageEntities | PageGrid);
if (config.button1Page !== null && method == "button1") { if (config.button1Page !== null && method == "button1") {
page = config.button1Page; page = config.button1Page;
pageId = -1;
} }
else if (config.button2Page !== null && method == "button2") { else if (config.button2Page !== null && method == "button2") {
page = config.button2Page; page = config.button2Page;
pageId = -2;
} }
else { else {
return; return;
} }
// Set pageId to -1, because of the navigation arrows
let tempPageId = pageId;
pageId = -1;
GeneratePage(page); GeneratePage(page);
pageId = tempPageId;
} }
function HandleStartupProcess(): void { function HandleStartupProcess(): void {
@@ -425,7 +424,12 @@ function RegisterEntityWatcher(id: string): void {
return; return;
} }
subscriptions[id] = (on({ id: id, change: 'any' }, function (data) { subscriptions[id] = (on({ id: id, change: 'any' }, function (data) {
if(pageId >= 0)
SendToPanel({ payload: GeneratePageElements(config.pages[pageId]) }); SendToPanel({ payload: GeneratePageElements(config.pages[pageId]) });
if(pageId == -1 && config.button1Page != undefined)
SendToPanel({ payload: GeneratePageElements(config.button1Page) });
if(pageId == -2 && config.button2Page != undefined)
SendToPanel({ payload: GeneratePageElements(config.button2Page) });
})) }))
} }