free
/
searx
Bevaka 1
Stjärnmärk 0
Förgrening 0
Kod Ärenden 0 Pull-förfrågningar 0 Släpp 11 Wiki Activity
Bläddra i källkod

Merge pull request #241 from Cqoicebordel/Remove-whitespace 

Remove whitespace and allow autocompleter to work in sub folders
Adam Tauber 10 år sedan
förälder
2c4631292f f7b052c354
incheckning
73e9a35851
6 ändrade filer med 8 tillägg och 6 borttagningar
Unifierad Vy Visa Diff Statistik
  1. 1
    1
      searx/static/themes/courgette/js/searx.js
  2. 1
    1
      searx/static/themes/default/js/searx.js
  3. 1
    1
      searx/static/themes/oscar/js/searx.min.js
  4. 1
    1
      searx/static/themes/oscar/js/searx_src/autocompleter.js
  5. 2
    2
      searx/templates/oscar/base.html
  6. 2
    0
      searx/webapp.py

+ 1
- 1
searx/static/themes/courgette/js/searx.js Visa fil

1 
 if(searx.autocompleter) {
 1 
 if(searx.autocompleter) {
2 
     window.addEvent('domready', function() {
 2 
     window.addEvent('domready', function() {
3 
-	    new Autocompleter.Request.JSON('q', '/autocompleter', {
3 
+	    new Autocompleter.Request.JSON('q', './autocompleter', {
4 
 		    postVar:'q',
 4 
 		    postVar:'q',
5 
 		    postData:{
 5 
 		    postData:{
6 
 			    'format': 'json'
 6 
 			    'format': 'json'

+ 1
- 1
searx/static/themes/default/js/searx.js Visa fil

1 
 if(searx.autocompleter) {
 1 
 if(searx.autocompleter) {
2 
     window.addEvent('domready', function() {
 2 
     window.addEvent('domready', function() {
3 
-	    new Autocompleter.Request.JSON('q', '/autocompleter', {
3 
+	    new Autocompleter.Request.JSON('q', './autocompleter', {
4 
 		    postVar:'q',
 4 
 		    postVar:'q',
5 
 		    postData:{
 5 
 		    postData:{
6 
 			    'format': 'json'
 6 
 			    'format': 'json'

+ 1
- 1
searx/static/themes/oscar/js/searx.min.js
Filskillnaden har hållits tillbaka eftersom den är för stor
Visa fil


+ 1
- 1
searx/static/themes/oscar/js/searx_src/autocompleter.js Visa fil

19 
     searx.searchResults = new Bloodhound({
19 
     searx.searchResults = new Bloodhound({
20 
         datumTokenizer: Bloodhound.tokenizers.obj.whitespace('value'),
20 
         datumTokenizer: Bloodhound.tokenizers.obj.whitespace('value'),
21 
         queryTokenizer: Bloodhound.tokenizers.whitespace,
21 
         queryTokenizer: Bloodhound.tokenizers.whitespace,
22 
-        remote: '/autocompleter?q=%QUERY'
22 
+        remote: './autocompleter?q=%QUERY'
23 
     });
23 
     });
24 
     searx.searchResults.initialize();
24 
     searx.searchResults.initialize();
25 
 }
25 
 }

+ 2
- 2
searx/templates/oscar/base.html Visa fil

46 
 <body>
 46 
 <body>
47 
     <div class="container">
 47 
     <div class="container">
48 
     {% include 'oscar/navbar.html' %}
 48 
     {% include 'oscar/navbar.html' %}
49 
-
49 
+
50 
     {% block site_alert_error %}
 50 
     {% block site_alert_error %}
51 
     {% endblock %}
 51 
     {% endblock %}
52 
     {% block site_alert_warning %}
 52 
     {% block site_alert_warning %}
62 
     {% endblock %}
 62 
     {% endblock %}
63 
     {% block site_alert_success %}
 63 
     {% block site_alert_success %}
64 
     {% endblock %}
 64 
     {% endblock %}
65 
-
65 
+
66 
     {% block content %}
 66 
     {% block content %}
67 
     {% endblock %}
 67 
     {% endblock %}
68
68

+ 2
- 0
searx/webapp.py Visa fil

81 
     template_folder=templates_path
 81 
     template_folder=templates_path
82 
 )
 82 
 )
83
83
84 
+app.jinja_env.trim_blocks = True
85 
+app.jinja_env.lstrip_blocks = True
84 
 app.secret_key = settings['server']['secret_key']
 86 
 app.secret_key = settings['server']['secret_key']
85
87
86 
 babel = Babel(app)
 88 
 babel = Babel(app)