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

Conflicts:
	searx/engines/searchcode_code.py
	searx/engines/searchcode_doc.py
	searx/static/oscar/js/searx.min.js
	searx/templates/oscar/result_templates/default.html
	searx/templates/oscar/result_templates/images.html
	searx/templates/oscar/result_templates/map.html
	searx/templates/oscar/result_templates/torrent.html
	searx/templates/oscar/result_templates/videos.html

1 files changed, 37 insertions, 0 deletions

diff --git a/searx/static/themes/oscar/js/searx_src/autocompleter.js b/searx/static/themes/oscar/js/searx_src/autocompleter.js
new file mode 100644
index 000000000..561bff35a
--- /dev/null
+++ b/searx/static/themes/oscar/js/searx_src/autocompleter.js
@@ -0,0 +1,37 @@
+/**

+ * searx is free software: you can redistribute it and/or modify

+ * it under the terms of the GNU Affero General Public License as published by

+ * the Free Software Foundation, either version 3 of the License, or

+ * (at your option) any later version.

+ *

+ * searx is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ * GNU Affero General Public License for more details.

+ *

+ * You should have received a copy of the GNU Affero General Public License

+ * along with searx. If not, see < http://www.gnu.org/licenses/ >.

+ *

+ * (C) 2014 by Thomas Pointhuber, <thomas.pointhuber@gmx.at>

+ */

+

+if(searx.autocompleter) {

+    searx.searchResults = new Bloodhound({

+        datumTokenizer: Bloodhound.tokenizers.obj.whitespace('value'),

+        queryTokenizer: Bloodhound.tokenizers.whitespace,

+        remote: '/autocompleter?q=%QUERY'

+    });

+    searx.searchResults.initialize();

+}

+

+$(document).ready(function(){ 

+    if(searx.autocompleter) {

+        $('#q').typeahead(null, {

+            name: 'search-results',

+            displayKey: function(result) {

+                return result;

+            },

+            source: searx.searchResults.ttAdapter()

+        });

+    }

+});