search form focus restoring after submit triggered by return key (#1797)

Author: emergie

src/org/opensolaris/opengrok/web/Scripts.java

@@ -125,7 +125,7 @@ public String toHtml() {
         SCRIPTS.put("jquery-tablesorter", new FileScript("js/jquery-tablesorter-2.26.6.min.js", 12));
         SCRIPTS.put("tablesorter-parsers", new FileScript("js/tablesorter-parsers-0.0.1.js", 13));
         SCRIPTS.put("searchable-option-list", new FileScript("js/searchable-option-list-2.0.4.min.js", 14));
-        SCRIPTS.put("utils", new FileScript("js/utils-0.0.16.js", 15));
+        SCRIPTS.put("utils", new FileScript("js/utils-0.0.17.js", 15));
         SCRIPTS.put("repos", new FileScript("js/repos-0.0.1.js", 20));
         SCRIPTS.put("diff", new FileScript("js/diff-0.0.2.js", 20));
     }

web/js/utils-0.0.16.js renamed to web/js/utils-0.0.17.js

@@ -1565,6 +1565,7 @@ $(document).ready(function () {
      */
     init_markdown_converter();
 
+    restoreFocusAfterSearchSubmit();
 });
 
 /**
@@ -1941,3 +1942,41 @@ function scope_on_scroll() {
 function isOnSearchPage() {
     return $(document.documentElement).hasClass('search');
 }
+
+/**
+ * Handles submit on search form.
+ *
+ * If submit was initiated by pressing the return key when focus was
+ * in a text field then `si` attribute will be added to the form.
+ *
+ * @param {HTMLFormElement} form
+ */
+function searchSubmit(form) {
+    var submitInitiator = '';
+    if (document.activeElement && document.activeElement.nodeName === 'INPUT') {
+        submitInitiator = document.activeElement.getAttribute('id');
+    }
+    if (submitInitiator) {
+        var input = document.createElement('INPUT');
+        input.setAttribute('name', 'si');
+        input.value = submitInitiator;
+        form.appendChild(input);
+    }
+}
+
+/**
+ * Restores focus on page load
+ *
+ * @see #searchSubmit
+ */
+function restoreFocusAfterSearchSubmit() {
+    var siParam = getParameter('si');
+    if (siParam) {
+        var $input = $('input[type=text][id="' + siParam + '"]');
+        if ($input.length === 1) {
+            $input[0].selectionStart = $input.val().length;
+            $input[0].selectionEnd = $input[0].selectionStart;
+            $input.focus();
+        }
+    }
+}

web/menu.jspf

@@ -77,7 +77,7 @@ org.opensolaris.opengrok.web.Util"
 </script><%
     }
 %>
-<form action="<%= request.getContextPath() %>/search" id="sbox">
+<form action="<%= request.getContextPath() %>/search" id="sbox" onsubmit="searchSubmit(this)">
 <div id="qtbl">
     <table>
     <%