From 72f7b52cb0086c4c927818c86986ab35bae36452 Mon Sep 17 00:00:00 2001
From: joeycastillo <joeycastillo@users.noreply.github.com>
Date: Tue, 6 Dec 2022 05:18:47 +0000
Subject: deploy: 80ce98bc650b949af4257b555dd50bad3f108826

---
 menu.js | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

(limited to 'menu.js')

diff --git a/menu.js b/menu.js
index 818b859b..b0b26936 100644
--- a/menu.js
+++ b/menu.js
@@ -44,28 +44,26 @@ function initMenu(relPath,searchEnabled,serverSide,searchPage,search) {
     }
     return result;
   }
-  var searchBox;
+  var searchBoxHtml;
   if (searchEnabled) {
     if (serverSide) {
-      searchBox='<div id="MSearchBox" class="MSearchBoxInactive">'+
+      searchBoxHtml='<div id="MSearchBox" class="MSearchBoxInactive">'+
                  '<div class="left">'+
                   '<form id="FSearchBox" action="'+relPath+searchPage+
-                    '" method="get"><img id="MSearchSelect" src="'+
-                    relPath+'search/mag.svg" alt=""/>'+
-                  '<input type="text" id="MSearchField" name="query" value="'+search+
+                    '" method="get"><span id="MSearchSelectExt">&#160;</span>'+
+                  '<input type="text" id="MSearchField" name="query" value="" placeholder="'+search+
                     '" size="20" accesskey="S" onfocus="searchBox.OnSearchFieldFocus(true)"'+
-                    ' onblur="searchBox.OnSearchFieldFocus(false)">'+
+                    ' onblur="searchBox.OnSearchFieldFocus(false)"/>'+
                   '</form>'+
                  '</div>'+
                  '<div class="right"></div>'+
                 '</div>';
     } else {
-      searchBox='<div id="MSearchBox" class="MSearchBoxInactive">'+
+      searchBoxHtml='<div id="MSearchBox" class="MSearchBoxInactive">'+
                  '<span class="left">'+
-                  '<img id="MSearchSelect" src="'+relPath+
-                     'search/mag_sel.svg" onmouseover="return searchBox.OnSearchSelectShow()"'+
-                     ' onmouseout="return searchBox.OnSearchSelectHide()" alt=""/>'+
-                  '<input type="text" id="MSearchField" value="'+search+
+                  '<span id="MSearchSelect" onmouseover="return searchBox.OnSearchSelectShow()"'+
+                     ' onmouseout="return searchBox.OnSearchSelectHide()">&#160;</span>'+
+                  '<input type="text" id="MSearchField" value="" placeholder="'+search+
                     '" accesskey="S" onfocus="searchBox.OnSearchFieldFocus(true)" '+
                     'onblur="searchBox.OnSearchFieldFocus(false)" '+
                     'onkeyup="searchBox.OnSearchFieldChange(event)"/>'+
@@ -73,8 +71,8 @@ function initMenu(relPath,searchEnabled,serverSide,searchPage,search) {
                  '<span class="right"><a id="MSearchClose" '+
                   'href="javascript:searchBox.CloseResultsWindow()">'+
                   '<img id="MSearchCloseImg" border="0" src="'+relPath+
-                  'search/close.svg" alt=""/></a>'
-                 '</span>'
+                  'search/close.svg" alt=""/></a>'+
+                 '</span>'+
                 '</div>';
     }
   }
@@ -87,7 +85,7 @@ function initMenu(relPath,searchEnabled,serverSide,searchPage,search) {
                         '</div>');
   $('#main-nav').append(makeTree(menudata,relPath));
   $('#main-nav').children(':first').addClass('sm sm-dox').attr('id','main-menu');
-  if (searchBox) {
+  if (searchBoxHtml) {
     $('#main-menu').append('<li id="searchBoxPos2" style="float:right"></li>');
   }
   var $mainMenuState = $('#main-menu-state');
@@ -116,14 +114,17 @@ function initMenu(relPath,searchEnabled,serverSide,searchPage,search) {
       if (newWidth!=prevWidth) {
         if ($(window).outerWidth()<768) {
           $mainMenuState.prop('checked',false); $menu.hide();
-          $('#searchBoxPos1').html(searchBox);
+          $('#searchBoxPos1').html(searchBoxHtml);
           $('#searchBoxPos2').hide();
         } else {
           $menu.show();
           $('#searchBoxPos1').empty();
-          $('#searchBoxPos2').html(searchBox);
+          $('#searchBoxPos2').html(searchBoxHtml);
           $('#searchBoxPos2').show();
         }
+        if (typeof searchBox!=='undefined') {
+          searchBox.CloseResultsWindow();
+        }
         prevWidth = newWidth;
       }
     }
-- 
cgit v1.2.3