From 68352a7a83ff5663a6fd9e53981ee6d9bb74f1c3 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Fri, 26 Jul 2024 16:32:12 +0000
Subject: [PATCH] Bug 37373: [Alternate] Combine duplicate class attributes

This patch corrects two instances in patron-search.inc where there were
two class attributes on one input. Combining the two class names under
one class attribute seems to fix the focus problem.

The patch also updates the global JS giving focus to elements with a
"focus" class so that it only targets elements which are visible. This
prevents the browser from trying to put focus on a field in a hidden
modal.

Signed-off-by: Andrew Fuerste Henry <andrewfh@dubcolib.org>
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
---
 koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc | 4 ++--
 koha-tmpl/intranet-tmpl/prog/js/staff-global.js            | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
index d238a31cb3..38f67aad87 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
@@ -13,7 +13,7 @@
 [% BLOCK patron_search_filters_simple  %]
     <form method="get" class="patron_search_form">
         <div class="hint">Enter patron card number or partial name:</div>
-        <input type="text" size="40" class="search_patron_filter" class="focus" autocomplete="off" />
+        <input type="text" size="40" class="search_patron_filter focus" autocomplete="off" />
         <input type="submit" class="btn btn-primary" value="Search" />
     </form>
 [% END %]
@@ -36,7 +36,7 @@
                 <ol>
                     <li>
                         <label>Search:</label>
-                        <input type="text" class="search_patron_filter" value="[% search_filter | html %]" class="focus" />
+                        <input type="text" class="search_patron_filter focus" value="[% search_filter | html %]" />
                     </li>
 
                     [% FOR f IN filters %]
diff --git a/koha-tmpl/intranet-tmpl/prog/js/staff-global.js b/koha-tmpl/intranet-tmpl/prog/js/staff-global.js
index 874c3fbebb..46bb938918 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/staff-global.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/staff-global.js
@@ -132,7 +132,8 @@ $(document).ready(function () {
         }
     });
 
-    $(".focus").focus();
+    $(".focus:visible").focus();
+
     $(".validated").each(function () {
         $(this).validate();
     });
-- 
2.39.2