Merge branch 'archweb-generic' into master-nomake

Conflicts:
	templates/public/download.html

1 files changed, 12 insertions, 1 deletions

diff --git a/templates/public/index.html b/templates/public/index.html
index f5470d14..b97c7909 100644
--- a/templates/public/index.html
+++ b/templates/public/index.html
@@ -237,8 +237,19 @@ function setupTypeahead() {
         matcher: function(item) { return true; },
         sorter: function(items) { return items; },
         menu: '<ul class="pkgsearch-typeahead"></ul>',
-        items: 10
+        items: 10,
+        updater: function(item) {
+            $('#pkgsearch-field').val(item);
+            $('#pkgsearch-form').submit();
+            return item;
+        }
     }).attr('autocomplete', 'off');
+    $('#pkgsearch-field').keyup(function(e) {
+        if (e.keyCode === 13 &&
+                $('ul.pkgsearch-typeahead li.active').size() === 0) {
+            $('#pkgsearch-form').submit();
+        }
+    });
 }
 function setupKonami() {
     var konami = new Konami(function() {