From 491a738f9310a425dcf983704e3421811aada152 Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 7 Feb 2023 19:36:23 +0100 Subject: [PATCH 1/3] Update NsPanelTs_without_Examples.ts --- ioBroker/NsPanelTs_without_Examples.ts | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ioBroker/NsPanelTs_without_Examples.ts b/ioBroker/NsPanelTs_without_Examples.ts index 07c2e202..fb9c4a06 100644 --- a/ioBroker/NsPanelTs_without_Examples.ts +++ b/ioBroker/NsPanelTs_without_Examples.ts @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------- -TypeScript v3.9.0.3 zur Steuerung des SONOFF NSPanel mit dem ioBroker by @Armilar / @Sternmiere / @Britzelpuf +TypeScript v3.9.0.7 zur Steuerung des SONOFF NSPanel mit dem ioBroker by @Armilar / @Sternmiere / @Britzelpuf - abgestimmt auf TFT 49 / v3.9.0 / BerryDriver 8 / Tasmota 12.3.1 @joBr99 Projekt: https://github.com/joBr99/nspanel-lovelace-ui/tree/main/ioBroker NsPanelTs.ts (dieses TypeScript in ioBroker) Stable: https://github.com/joBr99/nspanel-lovelace-ui/blob/main/ioBroker/NsPanelTs.ts @@ -97,7 +97,8 @@ ReleaseNotes: - 28.01.2023 - v3.9.0 Fix TFT-Version Path in function update_tft_firmware (drop ".") - 29.01.2023 - v3.9.0 Upgrade TFT 49 - 03.02.2023 - v3.9.0.2 Hotfix Screensaver bExit - - 06.02.2023 - v3.9.0.3 PR #754 - added missing 'tempUpdHighLow' ButtonEvent handling - by @fre4242 + - 06.02.2023 - v3.9.0.3 PR #754 - added missing 'tempUpdHighLow' ButtonEvent handling - by @fre4242 + - 07.02.2023 - v3.9.0.4 Open activepage again after closing popupLight or popupShutter Todo Next Release - XX.XX.2023 - v4.0.0 Add cardUnlock @@ -4469,7 +4470,9 @@ function HandleButtonEvent(words: any): void { GeneratePage(eval(activePage.prev)); break; case 'bExit': - if (getState(NSPanel_Path + 'Config.Screensaver.screenSaverDoubleClick').val && words[2] == 'screensaver') { + if ((words[2] == 'popupShutter') || (words[2] == 'popupLight')) { + GeneratePage(activePage); + } else if (getState(NSPanel_Path + 'Config.Screensaver.screenSaverDoubleClick').val && words[2] == 'screensaver') { if (words[4] >= 2) { setIfExists(NSPanel_Path + 'ScreensaverInfo.popupNotifyHeading', ''); setIfExists(NSPanel_Path + 'ScreensaverInfo.popupNotifyText', ''); From 54b05ad618d0f5044471ff35c9c6e7ae76d33dc0 Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 7 Feb 2023 19:36:31 +0100 Subject: [PATCH 2/3] Update NsPanelTs.ts --- ioBroker/NsPanelTs.ts | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ioBroker/NsPanelTs.ts b/ioBroker/NsPanelTs.ts index 62a0bfb3..5597c222 100644 --- a/ioBroker/NsPanelTs.ts +++ b/ioBroker/NsPanelTs.ts @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------- -TypeScript v3.9.0.3 zur Steuerung des SONOFF NSPanel mit dem ioBroker by @Armilar / @Sternmiere / @Britzelpuf +TypeScript v3.9.0.4 zur Steuerung des SONOFF NSPanel mit dem ioBroker by @Armilar / @Sternmiere / @Britzelpuf - abgestimmt auf TFT 49 / v3.9.0 / BerryDriver 8 / Tasmota 12.3.1 @joBr99 Projekt: https://github.com/joBr99/nspanel-lovelace-ui/tree/main/ioBroker NsPanelTs.ts (dieses TypeScript in ioBroker) Stable: https://github.com/joBr99/nspanel-lovelace-ui/blob/main/ioBroker/NsPanelTs.ts @@ -97,7 +97,8 @@ ReleaseNotes: - 28.01.2023 - v3.9.0 Fix TFT-Version Path in function update_tft_firmware (drop ".") - 29.01.2023 - v3.9.0 Upgrade TFT 49 - 03.02.2023 - v3.9.0.2 Hotfix Screensaver bExit - - 06.02.2023 - v3.9.0.3 PR #754 - added missing 'tempUpdHighLow' ButtonEvent handling - by @fre4242 + - 06.02.2023 - v3.9.0.3 PR #754 - added missing 'tempUpdHighLow' ButtonEvent handling - by @fre4242 + - 07.02.2023 - v3.9.0.4 Open activepage again after closing popupLight or popupShutter Todo Next Release - XX.XX.2023 - v4.0.0 Add cardUnlock @@ -4851,7 +4852,9 @@ function HandleButtonEvent(words: any): void { GeneratePage(eval(activePage.prev)); break; case 'bExit': - if (getState(NSPanel_Path + 'Config.Screensaver.screenSaverDoubleClick').val && words[2] == 'screensaver') { + if ((words[2] == 'popupShutter') || (words[2] == 'popupLight')) { + GeneratePage(activePage); + } else if (getState(NSPanel_Path + 'Config.Screensaver.screenSaverDoubleClick').val && words[2] == 'screensaver') { if (words[4] >= 2) { setIfExists(NSPanel_Path + 'ScreensaverInfo.popupNotifyHeading', ''); setIfExists(NSPanel_Path + 'ScreensaverInfo.popupNotifyText', ''); From 31d60c2ed0f36592f77f6bc79a7f1509ffed901a Mon Sep 17 00:00:00 2001 From: Armilar <102996011+Armilar@users.noreply.github.com> Date: Tue, 7 Feb 2023 22:34:34 +0100 Subject: [PATCH 3/3] Update NsPanelTs_without_Examples.ts --- ioBroker/NsPanelTs_without_Examples.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ioBroker/NsPanelTs_without_Examples.ts b/ioBroker/NsPanelTs_without_Examples.ts index fb9c4a06..db76771c 100644 --- a/ioBroker/NsPanelTs_without_Examples.ts +++ b/ioBroker/NsPanelTs_without_Examples.ts @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------- -TypeScript v3.9.0.7 zur Steuerung des SONOFF NSPanel mit dem ioBroker by @Armilar / @Sternmiere / @Britzelpuf +TypeScript v3.9.0.4 zur Steuerung des SONOFF NSPanel mit dem ioBroker by @Armilar / @Sternmiere / @Britzelpuf - abgestimmt auf TFT 49 / v3.9.0 / BerryDriver 8 / Tasmota 12.3.1 @joBr99 Projekt: https://github.com/joBr99/nspanel-lovelace-ui/tree/main/ioBroker NsPanelTs.ts (dieses TypeScript in ioBroker) Stable: https://github.com/joBr99/nspanel-lovelace-ui/blob/main/ioBroker/NsPanelTs.ts