From 2621c24cc7992a7c6968d5ce389364c3bf4cc7e2 Mon Sep 17 00:00:00 2001
From: Adam Tauber <asciimoo@gmail.com>
Date: Mon, 23 Mar 2020 12:41:02 +0100
Subject: [PATCH 1/3] [enh] add clear search button to oscar theme - fixes #454

---
 searx/templates/oscar/search.html      | 1 +
 searx/templates/oscar/search_full.html | 1 +
 2 files changed, 2 insertions(+)

diff --git a/searx/templates/oscar/search.html b/searx/templates/oscar/search.html
index cad9eca89..9978801ca 100644
--- a/searx/templates/oscar/search.html
+++ b/searx/templates/oscar/search.html
@@ -6,6 +6,7 @@
         <input type="search" name="q" class="form-control" id="q" placeholder="{{ _('Search for...') }}" aria-label="{{ _('Search for...') }}" autocomplete="off" value="{{ q }}" accesskey="s">
         <span class="input-group-btn">
             <button type="submit" class="btn btn-default" aria-label="{{ _('Start search') }}"><span class="hide_if_nojs">{{ icon('search') }}</span><span class="hidden active_if_nojs">{{ _('Start search') }}</span></button>
+            <button type="reset" class="btn btn-default" aria-label="{{ _('Clear search') }}"><span class="hide_if_nojs">{{ icon('remove') }}</span><span class="hidden active_if_nojs">{{ _('Clear') }}</span></button>
         </span>
       </div>
     </div>
diff --git a/searx/templates/oscar/search_full.html b/searx/templates/oscar/search_full.html
index 656463178..ea821dc45 100644
--- a/searx/templates/oscar/search_full.html
+++ b/searx/templates/oscar/search_full.html
@@ -9,6 +9,7 @@
         <input type="search" name="q" class="form-control input-lg autofocus" id="q" placeholder="{{ _('Search for...') }}" aria-label="{{ _('Search for...') }}" autocomplete="off" value="{{ q }}" accesskey="s">
         <span class="input-group-btn">
             <button type="submit" class="btn btn-default input-lg" aria-label="{{ _('Start search') }}"><span class="hide_if_nojs">{{ icon('search') }}</span><span class="hidden active_if_nojs">{{ _('Start search') }}</span></button>
+            <button type="reset" class="btn btn-default input-lg" aria-label="{{ _('Clear search') }}"><span class="hide_if_nojs">{{ icon('remove') }}</span><span class="hidden active_if_nojs">{{ _('Clear') }}</span></button>
         </span>
     </div>
     <div class="col-md-8 col-md-offset-2  advanced">

From 65cae857354a5268253e40556153e994fa747e3d Mon Sep 17 00:00:00 2001
From: Adam Tauber <asciimoo@gmail.com>
Date: Mon, 23 Mar 2020 13:05:19 +0100
Subject: [PATCH 2/3] [fix] load new page with infinite scroll if there is no
 scrollbar - fixes #759

---
 searx/static/plugins/js/infinite_scroll.js | 50 ++++++++++++++--------
 1 file changed, 33 insertions(+), 17 deletions(-)

diff --git a/searx/static/plugins/js/infinite_scroll.js b/searx/static/plugins/js/infinite_scroll.js
index db84a6908..9930880e3 100644
--- a/searx/static/plugins/js/infinite_scroll.js
+++ b/searx/static/plugins/js/infinite_scroll.js
@@ -1,24 +1,40 @@
+function hasScrollbar() {
+    var root = document.compatMode=='BackCompat'? document.body : document.documentElement;
+    return root.scrollHeight>root.clientHeight;
+}
+
+function loadNextPage() {
+    var formData = $('#pagination form:last').serialize();
+    if (formData) {
+        $('#pagination').html('<div class="loading-spinner"></div>');
+        $.ajax({
+            type: "POST",
+            url: './',
+            data: formData,
+            dataType: 'html',
+            success: function(data) {
+                var body = $(data);
+                $('#pagination').remove();
+                $('#main_results').append('<hr/>');
+                $('#main_results').append(body.find('.result'));
+                $('#main_results').append(body.find('#pagination'));
+                if(!hasScrollbar()) {
+                    loadNextPage();
+                }
+            }
+        });
+    }
+}
+
 $(document).ready(function() {
     var win = $(window);
+    if(!hasScrollbar()) {
+        loadNextPage();
+    }
     win.scroll(function() {
+        $("#pagination button").css("visibility", "hidden");
         if ($(document).height() - win.height() - win.scrollTop() < 150) {
-            var formData = $('#pagination form:last').serialize();
-            if (formData) {
-                $('#pagination').html('<div class="loading-spinner"></div>');
-                $.ajax({
-                    type: "POST",
-                    url: './',
-                    data: formData,
-                    dataType: 'html',
-                    success: function(data) {
-                        var body = $(data);
-                        $('#pagination').remove();
-                        $('#main_results').append('<hr/>');
-                        $('#main_results').append(body.find('.result'));
-                        $('#main_results').append(body.find('#pagination'));
-                    }
-                });
-            }
+            loadNextPage();
         }
     });
 });

From 9a2f26d915ee05d933a18c31bca2121658aa7ffd Mon Sep 17 00:00:00 2001
From: Adam Tauber <asciimoo@gmail.com>
Date: Mon, 23 Mar 2020 14:01:33 +0100
Subject: [PATCH 3/3] [enh] submit search on suggestion select - closes #807

---
 searx/static/themes/oscar/js/searx.js         |   3 +++
 searx/static/themes/oscar/js/searx.min.js     | Bin 4836 -> 4915 bytes
 .../oscar/js/searx_src/autocompleter.js       |   3 +++
 3 files changed, 6 insertions(+)

diff --git a/searx/static/themes/oscar/js/searx.js b/searx/static/themes/oscar/js/searx.js
index 927aeb422..9138576f5 100644
--- a/searx/static/themes/oscar/js/searx.js
+++ b/searx/static/themes/oscar/js/searx.js
@@ -86,6 +86,9 @@ $(document).ready(function(){
             },
             source: searx.searchResults.ttAdapter()
         });
+        $('#q').bind('typeahead:selected', function(ev, suggestion) {
+            $("#search_form").submit();
+        });
     }
 });
 ;/**
diff --git a/searx/static/themes/oscar/js/searx.min.js b/searx/static/themes/oscar/js/searx.min.js
index 354d9f2fee3b9b9dc6bf57c85f2bef7d0d19f058..4c01dca94820a1ef8230dcdfabf26f8464f2324a 100644
GIT binary patch
delta 164
zcmaE&x>;?4B$tt~u7R<xk%5uHM&&*xMvciEnacfjR5X;73zanWk}~sBG?Ypz3sMs^
zQWI0Gic@n^lS@)llyuTc^O8$4^Yb(kb&@ozLF$WB6N{2F;?wera)COFOOtXlOEffV
zH8pD|*D}d(_F&dyW=mGIwN*6ST*G#bMIciTXn1Ocf0{;$rmd~6;pQmrNsN;}@QAS}
Kf_QAa_gDd1CNhNp

delta 102
zcmdn2_C$4pB$t7iu7QQFk%6J*M&&-H$(xwU8EYrkGRbeA&aB7Grf8^WYn#0JG}}2A
z0bN5|+f2R8yp+@m|1^yh&CM&hCoxLt0#zjGl_aJYN2kQXWtFUyG&hIx-eUy-Io%&~

diff --git a/searx/static/themes/oscar/js/searx_src/autocompleter.js b/searx/static/themes/oscar/js/searx_src/autocompleter.js
index 0907f8e34..985be2c7c 100644
--- a/searx/static/themes/oscar/js/searx_src/autocompleter.js
+++ b/searx/static/themes/oscar/js/searx_src/autocompleter.js
@@ -33,5 +33,8 @@ $(document).ready(function(){
             },
             source: searx.searchResults.ttAdapter()
         });
+        $('#q').bind('typeahead:selected', function(ev, suggestion) {
+            $("#search_form").submit();
+        });
     }
 });