From c2aa7d0cb41f2bf0e2348a30b6a617232e9fa237 Mon Sep 17 00:00:00 2001
From: Callum Ellis <callum.ellis@hotmail.co.uk>
Date: Wed, 13 Nov 2024 23:07:53 +0000
Subject: [PATCH] Added new option screensaver_stop_close_browser_mod_popup

---
 README.md    |  1 +
 wallpanel.js | 21 +++++++++++++++------
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index e159dde..8b96261 100644
--- a/README.md
+++ b/README.md
@@ -71,6 +71,7 @@ You can set the following configuration parameters for every individual Home Ass
 | disable_screensaver_on_browser_mod_popup     | Disable screensaver if a browser mod popup is active?                                      | false     |
 | disable_screensaver_on_browser_mod_popup_func| Javascript function to determine whether to disable screensaver based on active browser mod popup ([see below](#disable_screensaver_on_browser_mod_popup_func)) |    |
 | screensaver_stop_navigation_path | Path to navigate to (e.g., /lovelace/default_view) when screensaver is stopped.                        |           |
+| screensaver_stop_close_browser_mod_popup | Close the active browser mod popup when screensaver is stopped?                                | false     |
 | screensaver_entity               | An entity of type 'input_boolean' to reflect and change the screensaver state (on = started, off = stopped). If browser_mod is installed, `${browser_id}` will be replaced with Browser ID (see below). |        |
 | show_images                      | Show images if screensaver is active?                                                                  | true      |
 | image_url                        | Fetch screensaver images from this URL. See below for details.                                         | See below |
diff --git a/wallpanel.js b/wallpanel.js
index 4370817..6f63b8e 100644
--- a/wallpanel.js
+++ b/wallpanel.js
@@ -126,6 +126,7 @@ const defaultConfig = {
 	black_screen_after_time: 0,
 	control_reactivation_time: 1.0,
 	screensaver_stop_navigation_path: '',
+	screensaver_stop_close_browser_mod_popup: false,
 	screensaver_entity: '',
 	stop_screensaver_on_mouse_move: true,
 	stop_screensaver_on_mouse_click: true,
@@ -2305,13 +2306,21 @@ class WallpanelView extends HuiView {
 
 		this.setScreensaverEntityState();
 
-		if (config.screensaver_stop_navigation_path) {
+		if (config.screensaver_stop_navigation_path || config.screensaver_stop_close_browser_mod_popup) {
 			this.screensaverStopNavigationPathTimeout = setTimeout(() => {
-				skipDisableScreensaverOnLocationChanged = true;
-				navigate(config.screensaver_stop_navigation_path);
-				setTimeout(() => {
-					skipDisableScreensaverOnLocationChanged = false;
-				}, 250);
+				if (config.screensaver_stop_navigation_path) {
+					skipDisableScreensaverOnLocationChanged = true;
+					navigate(config.screensaver_stop_navigation_path);
+					setTimeout(() => {
+						skipDisableScreensaverOnLocationChanged = false;
+					}, 250);
+				}
+				if (config.screensaver_stop_close_browser_mod_popup) {
+					let bmp = getActiveBrowserModPopup();
+					if (bmp) {
+						bmp.closeDialog();
+					}
+				}
 			}, (config.fade_in_time + 1) * 1000);
 		}
 	}