Browse Source

Merge pull request #241 from Cqoicebordel/Remove-whitespace

Remove whitespace and allow autocompleter to work in sub folders
Adam Tauber 10 years ago
parent
commit
73e9a35851

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

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

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

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

File diff suppressed because it is too large
+ 0 - 0
searx/static/themes/oscar/js/searx.min.js


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

@@ -19,7 +19,7 @@ if(searx.autocompleter) {
     searx.searchResults = new Bloodhound({
         datumTokenizer: Bloodhound.tokenizers.obj.whitespace('value'),
         queryTokenizer: Bloodhound.tokenizers.whitespace,
-        remote: '/autocompleter?q=%QUERY'
+        remote: './autocompleter?q=%QUERY'
     });
     searx.searchResults.initialize();
 }

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

@@ -46,7 +46,7 @@
 <body>
     <div class="container">
     {% include 'oscar/navbar.html' %}
-  
+
     {% block site_alert_error %}
     {% endblock %}
     {% block site_alert_warning %}
@@ -62,7 +62,7 @@
     {% endblock %}
     {% block site_alert_success %}
     {% endblock %}
-    
+
     {% block content %}
     {% endblock %}
 

+ 2 - 0
searx/webapp.py

@@ -81,6 +81,8 @@ app = Flask(
     template_folder=templates_path
 )
 
+app.jinja_env.trim_blocks = True
+app.jinja_env.lstrip_blocks = True
 app.secret_key = settings['server']['secret_key']
 
 babel = Babel(app)

Some files were not shown because too many files changed in this diff