소스 검색

Merge remote-tracking branch 'dalf/master'

asciimoo 11 년 전
부모
커밋
11fdd8e8ac
3개의 변경된 파일31개의 추가작업 그리고 3개의 파일을 삭제
  1. 27
    0
      searx/static/js/searx.js
  2. 1
    0
      searx/templates/base.html
  3. 3
    3
      searx/templates/results.html

+ 27
- 0
searx/static/js/searx.js 파일 보기

1
+(function (w, d) {
2
+    'use strict';
3
+    function addListener(el, type, fn) {
4
+        if (el.addEventListener) {
5
+            el.addEventListener(type, fn, false);
6
+        } else {
7
+            el.attachEvent('on' + type, fn);
8
+        }
9
+    }
10
+
11
+    function placeCursorAtEnd() {
12
+        if (this.setSelectionRange) {
13
+            var len = this.value.length * 2;
14
+            this.setSelectionRange(len, len);
15
+        }
16
+    }
17
+
18
+    addListener(w, 'load', function () {
19
+        var qinput = d.getElementById('q');
20
+        if (qinput !== null) {
21
+            addListener(qinput, 'focus', placeCursorAtEnd);
22
+            qinput.focus();
23
+        }
24
+    });
25
+
26
+})(window, document);
27
+

+ 1
- 0
searx/templates/base.html 파일 보기

18
 <div id="container">
18
 <div id="container">
19
 {% block content %}
19
 {% block content %}
20
 {% endblock %}
20
 {% endblock %}
21
+<script src="/static/js/searx.js" ></script>
21
 </div>
22
 </div>
22
 </body>
23
 </body>
23
 </html>
24
 </html>

+ 3
- 3
searx/templates/results.html 파일 보기

6
 </div>
6
 </div>
7
 <div id="results">
7
 <div id="results">
8
     {% if suggestions %}
8
     {% if suggestions %}
9
-    <div id="suggestions">Suggestions: {% for suggestion in suggestions %}<form method="post" action=""><input type="hidden" name="q" value="{{suggestion}}"><input type="submit" value="{{ suggestion }}" /></form>{% endfor %}</div>
9
+    <div id="suggestions">Suggestions: {% for suggestion in suggestions %}<form method="post" action="/"><input type="hidden" name="q" value="{{suggestion}}"><input type="submit" value="{{ suggestion }}" /></form>{% endfor %}</div>
10
     {% endif %}
10
     {% endif %}
11
     <div>
11
     <div>
12
         Number of results: {{ number_of_results }}
12
         Number of results: {{ number_of_results }}
18
             {% include 'result_templates/default.html' %}
18
             {% include 'result_templates/default.html' %}
19
         {% endif %}
19
         {% endif %}
20
     {% endfor %}
20
     {% endfor %}
21
-    <form method="post" action="">
21
+    <form method="post" action="/">
22
         <div class="left">
22
         <div class="left">
23
             <input type="hidden" name="q" value="{{ q }}" />
23
             <input type="hidden" name="q" value="{{ q }}" />
24
             <input type="hidden" name="format" value="csv" />
24
             <input type="hidden" name="format" value="csv" />
25
             <input type="submit" value="download results in csv" />
25
             <input type="submit" value="download results in csv" />
26
         </div>
26
         </div>
27
     </form>
27
     </form>
28
-    <form method="post" action="">
28
+    <form method="post" action="/">
29
         <div class="">
29
         <div class="">
30
             <input type="hidden" name="q" value="{{ q }}" />
30
             <input type="hidden" name="q" value="{{ q }}" />
31
             <input type="hidden" name="format" value="json" />
31
             <input type="hidden" name="format" value="json" />