From 84b606f95023ffb56476e25446e47481dad73fba Mon Sep 17 00:00:00 2001
From: Monica Cellio <cellio@pobox.com>
Date: Wed, 9 Oct 2024 16:43:04 -0400
Subject: [PATCH 1/6] automatically focus in the textbox when you start a
 search

---
 app/views/layouts/_header.html.erb | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 76ba0a1f8..8651a47ea 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -2,6 +2,20 @@
 <% mobile_logo_path = SiteSetting['MobileLogoPath'] %>
 <% sticky_header = user_preference('sticky_header', community: false) == 'true' %>
 
+<script>
+  $(document).ready(function () {
+      $('a[data-header-slide="#search-slide"]').on('click', focusSearch);
+  });
+
+  var search = false;
+  function focusSearch() {
+      search = !search;
+      if (search) {
+          $('#search').focus();
+      }
+  }
+</script>
+
 <header class="header is-small has-margin-0<%=' is-dark' if SiteSetting['SiteHeaderIsDark'] %><%= ' sticky' if sticky_header %>">
   <div class="container header--container">
     <div class="header--brand">

From ebcb47435c982622774d91ca93aa80577901bda9 Mon Sep 17 00:00:00 2001
From: Monica Cellio <cellio@pobox.com>
Date: Thu, 10 Oct 2024 23:08:38 -0400
Subject: [PATCH 2/6] better way to do this JS suggested by reviewer; we might
 be able to eliminate the JS entirely, but in the meantime let's commit this
 improvement

---
 app/views/layouts/_header.html.erb | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 8651a47ea..00347566a 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -3,17 +3,19 @@
 <% sticky_header = user_preference('sticky_header', community: false) == 'true' %>
 
 <script>
-  $(document).ready(function () {
-      $('a[data-header-slide="#search-slide"]').on('click', focusSearch);
-  });
+const toggleSearchFocus = () => {
+  const $input = $('#search');
 
-  var search = false;
-  function focusSearch() {
-      search = !search;
-      if (search) {
-          $('#search').focus();
-      }
+  if ($input.is(':focus')) {
+    $input.blur();
+  } else {
+    $input.focus();
   }
+};
+
+$(() => {
+  $('a[data-header-slide="#search-slide"]').on('click', toggleSearchFocus);
+});
 </script>
 
 <header class="header is-small has-margin-0<%=' is-dark' if SiteSetting['SiteHeaderIsDark'] %><%= ' sticky' if sticky_header %>">

From 762e27a381cf529150cd0c937405ab19cde74069 Mon Sep 17 00:00:00 2001
From: Monica Cellio <cellio@pobox.com>
Date: Wed, 9 Oct 2024 16:43:04 -0400
Subject: [PATCH 3/6] automatically focus in the textbox when you start a
 search

---
 app/views/layouts/_header.html.erb | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 76ba0a1f8..8651a47ea 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -2,6 +2,20 @@
 <% mobile_logo_path = SiteSetting['MobileLogoPath'] %>
 <% sticky_header = user_preference('sticky_header', community: false) == 'true' %>
 
+<script>
+  $(document).ready(function () {
+      $('a[data-header-slide="#search-slide"]').on('click', focusSearch);
+  });
+
+  var search = false;
+  function focusSearch() {
+      search = !search;
+      if (search) {
+          $('#search').focus();
+      }
+  }
+</script>
+
 <header class="header is-small has-margin-0<%=' is-dark' if SiteSetting['SiteHeaderIsDark'] %><%= ' sticky' if sticky_header %>">
   <div class="container header--container">
     <div class="header--brand">

From d9d8d84251d80818876a5e157aedfbb95a24cc4f Mon Sep 17 00:00:00 2001
From: Monica Cellio <cellio@pobox.com>
Date: Thu, 10 Oct 2024 23:08:38 -0400
Subject: [PATCH 4/6] better way to do this JS suggested by reviewer; we might
 be able to eliminate the JS entirely, but in the meantime let's commit this
 improvement

---
 app/views/layouts/_header.html.erb | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 8651a47ea..00347566a 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -3,17 +3,19 @@
 <% sticky_header = user_preference('sticky_header', community: false) == 'true' %>
 
 <script>
-  $(document).ready(function () {
-      $('a[data-header-slide="#search-slide"]').on('click', focusSearch);
-  });
+const toggleSearchFocus = () => {
+  const $input = $('#search');
 
-  var search = false;
-  function focusSearch() {
-      search = !search;
-      if (search) {
-          $('#search').focus();
-      }
+  if ($input.is(':focus')) {
+    $input.blur();
+  } else {
+    $input.focus();
   }
+};
+
+$(() => {
+  $('a[data-header-slide="#search-slide"]').on('click', toggleSearchFocus);
+});
 </script>
 
 <header class="header is-small has-margin-0<%=' is-dark' if SiteSetting['SiteHeaderIsDark'] %><%= ' sticky' if sticky_header %>">

From 4843709b03854b896be0b42bc9f4c40f582cfcfb Mon Sep 17 00:00:00 2001
From: Monica Cellio <cellio@pobox.com>
Date: Mon, 14 Oct 2024 16:15:08 -0400
Subject: [PATCH 5/6] formatting

---
 app/views/layouts/_header.html.erb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 00347566a..ca8862a55 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -8,9 +8,10 @@ const toggleSearchFocus = () => {
 
   if ($input.is(':focus')) {
     $input.blur();
-  } else {
-    $input.focus();
   }
+    else {
+	$input.focus();
+    }
 };
 
 $(() => {

From 653b1839c2a2213838b189a4e53eca9ba0e25e10 Mon Sep 17 00:00:00 2001
From: Monica Cellio <cellio@pobox.com>
Date: Mon, 14 Oct 2024 21:40:34 -0400
Subject: [PATCH 6/6] formatting again, because my editor suggested something
 goofy that I didn't catch

---
 app/views/layouts/_header.html.erb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index ca8862a55..bf3f6c612 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -9,9 +9,9 @@ const toggleSearchFocus = () => {
   if ($input.is(':focus')) {
     $input.blur();
   }
-    else {
-	$input.focus();
-    }
+  else {
+      $input.focus();
+  }
 };
 
 $(() => {