Merge branch 'master' of https://github.com/asciimoo/searx into filtron

searx/static/plugins/js/infinite_scroll.js

@@ -1,7 +1,9 @@
-$(document).ready(function() {
+function hasScrollbar() {
-    var win = $(window);
+    var root = document.compatMode=='BackCompat'? document.body : document.documentElement;
-    win.scroll(function() {
+    return root.scrollHeight>root.clientHeight;
-        if ($(document).height() - win.height() - win.scrollTop() < 150) {
+}
+
+function loadNextPage() {
     var formData = $('#pagination form:last').serialize();
     if (formData) {
         $('#pagination').html('<div class="loading-spinner"></div>');
@@ -16,9 +18,23 @@ $(document).ready(function() {
                 $('#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) {
+            loadNextPage();
         }
     });
 });

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();
+        });
     }
 });
 ;/**

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();
+        });
     }
 });

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>

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">