From c1d1fcccbf66271777fc81a4cba2a050f0c466af Mon Sep 17 00:00:00 2001 From: Squidly271 Date: Fri, 19 Sep 2025 00:37:10 -0400 Subject: [PATCH 1/2] Fix: Prevent GUI search if a modal is open Fixes a very minor issue in CA with the sidebar open --- emhttp/plugins/dynamix.gui.search/gui_search.page | 6 ++++++ 1 file changed, 6 insertions(+) mode change 100644 => 100755 emhttp/plugins/dynamix.gui.search/gui_search.page diff --git a/emhttp/plugins/dynamix.gui.search/gui_search.page b/emhttp/plugins/dynamix.gui.search/gui_search.page old mode 100644 new mode 100755 index ae6eed9f4..8ca40111a --- a/emhttp/plugins/dynamix.gui.search/gui_search.page +++ b/emhttp/plugins/dynamix.gui.search/gui_search.page @@ -37,6 +37,9 @@ function guiSearchBoxSpan() { function setupGUIsearch() { window.addEventListener('keydown',function(e){ if (!e.shiftKey && !e.altKey && (navigator.appVersion.indexOf('Mac')==-1 ? e.ctrlKey : e.metaKey) && e.keyCode==75) { + // If a modal is visible, don't open the search box + if ($('[role="modal"]').is(':visible')) return; + e.preventDefault(); isTopNavTheme()):?> if (guiSearchBoxSpan()) closeSearchBox(e); else gui_search(); @@ -79,6 +82,9 @@ function closeSearchBox(e) { } function guiSearch() { + // If a modal is visible, navigate away from the page + if ($('[role="modal"]').is(':visible')) return; + var searchInfo = $('#guiSearchBox').val().split('**'); var separator = ('fragmentDirective' in document) ? '#:~:text=' : '#'; var scrollText = (typeof searchInfo[1] != 'undefined') ? separator+searchInfo[1].replace(' ','%20').replace('-','%2d') : ''; From 60676290032e1f5fbc6b5144fb1d526228d50a93 Mon Sep 17 00:00:00 2001 From: Squidly271 Date: Fri, 19 Sep 2025 00:49:53 -0400 Subject: [PATCH 2/2] Missing word in comment for context --- emhttp/plugins/dynamix.gui.search/gui_search.page | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/emhttp/plugins/dynamix.gui.search/gui_search.page b/emhttp/plugins/dynamix.gui.search/gui_search.page index 8ca40111a..ba58976d4 100755 --- a/emhttp/plugins/dynamix.gui.search/gui_search.page +++ b/emhttp/plugins/dynamix.gui.search/gui_search.page @@ -82,7 +82,7 @@ function closeSearchBox(e) { } function guiSearch() { - // If a modal is visible, navigate away from the page + // If a modal is visible, don't navigate away from the page if ($('[role="modal"]').is(':visible')) return; var searchInfo = $('#guiSearchBox').val().split('**');