on master help sign in
Merge branch 'master' of https://github.com/asciimoo/searx into makefile-doc
commit5eb8cf4ebbe9066ba93b7f7e5efafaea4de079a4 authorMarkus Heiser <markus.heiser@darmarit.de> dateTue 24 Dec 2019, 18:00 (7 years ago) parent46dd51aa52a638
4 files changed+20−12
README.rst+3−3 searx/settings.yml+5−5 searx/settings_robot.yml+2−2 searx/static/plugins/js/vim_hotkeys.js+10−2
README.rst+3−3
@@ -23,13 +23,13 @@ Go to the `searx-docker <https://github.com/searx/searx-docker>`__ project.
2323
2424Without Docker
2525------
26−For all the details, follow this `step by step installation <https://asciimoo.github.io/searx/dev/install/installation.html>`__.
26+For all of the details, follow this `step by step installation <https://asciimoo.github.io/searx/dev/install/installation.html>`__.
2727
2828Note: the documentation needs to be updated.
2929
30−If you are in hurry
30+If you are in a hurry
3131------
32−- clone source:
32+- clone the source:
3333 ``git clone https://github.com/asciimoo/searx.git && cd searx``
3434- install dependencies: ``./manage.sh update_packages``
3535- edit your
searx/settings.yml+5−5
@@ -408,7 +408,7 @@ engines:
408408
409409 - name : library genesis
410410 engine : xpath
411− search_url : http://libgen.io/search.php?req={query}
411+ search_url : https://libgen.is/search.php?req={query}
412412 url_xpath : //a[contains(@href,"bookfi.net")]/@href
413413 title_xpath : //a[contains(@href,"book/")]/text()[1]
414414 content_xpath : //td/a[1][contains(@href,"=author")]/text()
@@ -464,7 +464,7 @@ engines:
464464 - name : openairedatasets
465465 engine : json_engine
466466 paging : True
467− search_url : http://api.openaire.eu/search/datasets?format=json&page={pageno}&size=10&title={query}
467+ search_url : https://api.openaire.eu/search/datasets?format=json&page={pageno}&size=10&title={query}
468468 results_query : response/results/result
469469 url_query : metadata/oaf:entity/oaf:result/children/instance/webresource/url/$
470470 title_query : metadata/oaf:entity/oaf:result/title/$
@@ -476,7 +476,7 @@ engines:
476476 - name : openairepublications
477477 engine : json_engine
478478 paging : True
479− search_url : http://api.openaire.eu/search/publications?format=json&page={pageno}&size=10&title={query}
479+ search_url : https://api.openaire.eu/search/publications?format=json&page={pageno}&size=10&title={query}
480480 results_query : response/results/result
481481 url_query : metadata/oaf:entity/oaf:result/children/instance/webresource/url/$
482482 title_query : metadata/oaf:entity/oaf:result/title/$
@@ -812,7 +812,7 @@ locales:
812812doi_resolvers :
813813 oadoi.org : 'https://oadoi.org/'
814814 doi.org : 'https://doi.org/'
815− doai.io : 'http://doai.io/'
816− sci-hub.tw : 'http://sci-hub.tw/'
815+ doai.io : 'https://doai.io/'
816+ sci-hub.tw : 'https://sci-hub.tw/'
817817
818818default_doi_resolver : 'oadoi.org'
searx/settings_robot.yml+2−2
@@ -43,7 +43,7 @@ locales:
4343doi_resolvers :
4444 oadoi.org : 'https://oadoi.org/'
4545 doi.org : 'https://doi.org/'
46− doai.io : 'http://doai.io/'
47− sci-hub.tw : 'http://sci-hub.tw/'
46+ doai.io : 'https://doai.io/'
47+ sci-hub.tw : 'https://sci-hub.tw/'
4848
4949default_doi_resolver : 'oadoi.org'
searx/static/plugins/js/vim_hotkeys.js+10−2
@@ -125,6 +125,14 @@ $(document).ready(function() {
125125 }
126126 });
127127
128+ function nextResult(current, direction) {
129+ var next = current[direction]();
130+ while (!next.is('.result') && next.length !== 0) {
131+ next = next[direction]();
132+ }
133+ return next
134+ }
135+
128136 function highlightResult(which) {
129137 return function() {
130138 var current = $('.result[data-vim-selected]');
@@ -157,13 +165,13 @@ $(document).ready(function() {
157165 }
158166 break;
159167 case 'down':
160− next = current.next('.result');
168+ next = nextResult(current, 'next');
161169 if (next.length === 0) {
162170 next = $('.result:first');
163171 }
164172 break;
165173 case 'up':
166− next = current.prev('.result');
174+ next = nextResult(current, 'prev');
167175 if (next.length === 0) {
168176 next = $('.result:last');
169177 }