summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpw3t <romain@berthor.fr>2014-01-03 19:00:37 +0100
committerpw3t <romain@berthor.fr>2014-01-03 19:00:37 +0100
commit04e7075c88b17d7c54e495dd48ca29064a042b82 (patch)
tree16eb65822e85761681ed8bd62f0af2ffe20bd6f3
parentefb6eca39e9dd851645f76bd72ac076f61a11c09 (diff)
parentb1c6b0a3f15576722743fe49ab02cd80301fcfd9 (diff)
Merge branch 'master' of https://github.com/asciimoo/searx
-rw-r--r--searx/static/js/searx.js2
-rw-r--r--searx/templates/search.html2
2 files changed, 2 insertions, 2 deletions
diff --git a/searx/static/js/searx.js b/searx/static/js/searx.js
index 5eb880f65..7b224a17f 100644
--- a/searx/static/js/searx.js
+++ b/searx/static/js/searx.js
@@ -17,7 +17,7 @@
addListener(w, 'load', function () {
var qinput = d.getElementById('q');
- if (qinput !== null) {
+ if (qinput !== null && qinput.value === "") {
addListener(qinput, 'focus', placeCursorAtEnd);
qinput.focus();
}
diff --git a/searx/templates/search.html b/searx/templates/search.html
index 51522b45c..12d507335 100644
--- a/searx/templates/search.html
+++ b/searx/templates/search.html
@@ -1,6 +1,6 @@
<form method="post" action="/" id="search_form">
<div id="search_wrapper">
- <input type="text" class="q" name="q" tabindex="1" autocomplete="off" {% if q %}value="{{ q }}"{% endif %}/>
+ <input type="text" id="q" class="q" name="q" tabindex="1" autocomplete="off" {% if q %}value="{{ q }}"{% endif %}/>
<input type="submit" value="" id="search_submit" />
</div>
<div>