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

v3.9.0.4 - pull request #760 by @ravenst0ne

Browse Source 
Open activepage again after closing popupLight or popupShutter
This commit is contained in:
Armilar
2023-02-07 22:37:04 +01:00
committed by GitHub
parent 86b8e63499 31d60c2ed0
commit bd72c94e6f
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ioBroker/NsPanelTs.ts
View File

@@ -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 - 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 @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 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 ".") - 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 - 29.01.2023 - v3.9.0 Upgrade TFT 49
- 03.02.2023 - v3.9.0.2 Hotfix Screensaver bExit - 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 Todo Next Release
- XX.XX.2023 - v4.0.0 Add cardUnlock - XX.XX.2023 - v4.0.0 Add cardUnlock
@@ -4851,7 +4852,9 @@ function HandleButtonEvent(words: any): void {
GeneratePage(eval(activePage.prev)); GeneratePage(eval(activePage.prev));
break; break;
case 'bExit': 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) { if (words[4] >= 2) {
setIfExists(NSPanel_Path + 'ScreensaverInfo.popupNotifyHeading', ''); setIfExists(NSPanel_Path + 'ScreensaverInfo.popupNotifyHeading', '');
setIfExists(NSPanel_Path + 'ScreensaverInfo.popupNotifyText', ''); setIfExists(NSPanel_Path + 'ScreensaverInfo.popupNotifyText', '');

9
ioBroker/NsPanelTs_without_Examples.ts
View File

@@ -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 - 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 @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 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 ".") - 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 - 29.01.2023 - v3.9.0 Upgrade TFT 49
- 03.02.2023 - v3.9.0.2 Hotfix Screensaver bExit - 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 Todo Next Release
- XX.XX.2023 - v4.0.0 Add cardUnlock - XX.XX.2023 - v4.0.0 Add cardUnlock
@@ -4469,7 +4470,9 @@ function HandleButtonEvent(words: any): void {
GeneratePage(eval(activePage.prev)); GeneratePage(eval(activePage.prev));
break; break;
case 'bExit': 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) { if (words[4] >= 2) {
setIfExists(NSPanel_Path + 'ScreensaverInfo.popupNotifyHeading', ''); setIfExists(NSPanel_Path + 'ScreensaverInfo.popupNotifyHeading', '');
setIfExists(NSPanel_Path + 'ScreensaverInfo.popupNotifyText', ''); setIfExists(NSPanel_Path + 'ScreensaverInfo.popupNotifyText', '');