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, 49 insertions, 0 deletions

diff --git a/searx/static/themes/default/js/searx.js b/searx/static/themes/default/js/searx.js
new file mode 100644
index 000000000..9be969bb3
--- /dev/null
+++ b/searx/static/themes/default/js/searx.js
@@ -0,0 +1,49 @@
+if(searx.autocompleter) {
+    window.addEvent('domready', function() {
+	    new Autocompleter.Request.JSON('q', '/autocompleter', {
+		    postVar:'q',
+		    postData:{
+			    'format': 'json'
+		    },
+		    ajaxOptions:{
+		        timeout: 5   // Correct option?
+		    },
+		    'minLength': 4,
+		    'selectMode': false,
+		    cache: true,
+		    delay: 300
+	    });
+    });
+}
+
+(function (w, d) {
+    'use strict';
+    function addListener(el, type, fn) {
+        if (el.addEventListener) {
+            el.addEventListener(type, fn, false);
+        } else {
+            el.attachEvent('on' + type, fn);
+        }
+    }
+
+    function placeCursorAtEnd() {
+        if (this.setSelectionRange) {
+            var len = this.value.length * 2;
+            this.setSelectionRange(len, len);
+        }
+    }
+
+    addListener(w, 'load', function () {
+        var qinput = d.getElementById('q');
+        if (qinput !== null && qinput.value === "") {
+            addListener(qinput, 'focus', placeCursorAtEnd);
+            qinput.focus();
+        }
+    });
+
+    if (!!('ontouchstart' in window)) {
+        document.getElementsByTagName("html")[0].className += " touch";
+    }
+
+})(window, document);
+