From a6cf8038bc424bc3da915ce27367831c3f6f3378 Mon Sep 17 00:00:00 2001
From: Mark Eaton <MarkEEaton@users.noreply.github.com>
Date: Sat, 27 Feb 2021 21:10:19 -0500
Subject: [PATCH] prevent form submit if there is no dropdown item selected

---
 groups/new-homepage-3/homepage3-js-css.html   | 19 +++++++++++++------
 groups/new-homepage-3/homepage3-template.html |  7 ++-----
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/groups/new-homepage-3/homepage3-js-css.html b/groups/new-homepage-3/homepage3-js-css.html
index ce3c2f8..28e879f 100644
--- a/groups/new-homepage-3/homepage3-js-css.html
+++ b/groups/new-homepage-3/homepage3-js-css.html
@@ -1,4 +1,4 @@
-<style>
+i<style>
 
 body {
         color: #111;
@@ -310,12 +310,19 @@ function customizeSearch(facet) {
 };
 </script>
 
-<!-- OneSearch widget script from OLS. Used without modification -->
+<!-- OneSearch widget script from OLS, modified -->
 <script type="text/javascript">
-function addPrimoQuery() {
-	document.getElementById("primoQuery").value = "any,contains," + document.getElementById("primoQueryTemp").value.replace(/[,]/g, " ");
-	/* If you changed the form name at the top, change it below to match */
-	document.forms["searchPrimoForm1"].submit();
+function addPrimoQuery(e) {
+        // prevent the user from submitting the form if no dropdown item has been selected
+        e.preventDefault();
+        e.stopPropagation();
+        if (document.getElementById("dropdownMenu1").innerHTML === 'Define Your Search <span class="caret"></span>') {
+                $("#dropdownMenu1").trigger('click.bs.dropdown.data-api');
+                return true;
+        };
+       document.getElementById("primoQuery").value = "any,contains," + document.getElementById("primoQueryTemp").value.replace(/[,]/g, " ");
+        /* If you changed the form name at the top, change it below to match */
+        document.forms["searchPrimoForm1"].submit();
 }
 </script>
 
diff --git a/groups/new-homepage-3/homepage3-template.html b/groups/new-homepage-3/homepage3-template.html
index b058c92..d75ac0b 100644
--- a/groups/new-homepage-3/homepage3-template.html
+++ b/groups/new-homepage-3/homepage3-template.html
@@ -194,10 +194,7 @@
                                                  <h1 id="onesearch-header">OneSearch</h1>
                                                  <div class="form-group">
                                                          <div class="dropdown input-group zero-margin">
-                                                                 <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
-                                                                         Define Your Search
-                                                                         <span class="caret"></span>
-                                                                 </button>
+                                                                 <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">Define Your Search <span class="caret"></span></button>
                                                                  <ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
                                                                          <li>
                                                                                  <div class="yamm-content yamm4">
@@ -266,7 +263,7 @@
                                                                  <input type="text" class="form-control form-width" name="queryTemp" id="primoQueryTemp" type="search" value="" placeholder="Enter search term here">
                                                          </div>
                                                          <div class="input-group zero-margin">
-                                                                 <input type="submit" class="btn btn-default form-control" value="Search" type="submit" onclick="addPrimoQuery();" />
+                                                                 <input type="submit" class="btn btn-default form-control" value="Search" type="submit" onclick="return addPrimoQuery(event);" />
                                                          </div>
                                                  </div>
                                          </form>