Skip to content

Commit 0767e00

Browse files
committed
removed autocomplete js
1 parent d30cc12 commit 0767e00

File tree

9 files changed

+6
-183
lines changed

9 files changed

+6
-183
lines changed

readthedocs/core/static-src/core/js/autocomplete.js

Lines changed: 0 additions & 13 deletions
This file was deleted.

readthedocs/core/static/core/js/autocomplete.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

readthedocs/gold/templates/gold/projects.html

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,6 @@
88
Gold Projects
99
{% endblock %}
1010

11-
{% block extra_scripts %}
12-
<script type="text/javascript" src="{% static 'core/js/autocomplete.js' %}"></script>
13-
<script type="text/javascript">
14-
var attach_project_autocomplete = require('core/autocomplete');
15-
$(document).ready(function () {
16-
attach_project_autocomplete('#id_project', '{% url "search_autocomplete" %}');
17-
});
18-
</script>
19-
{% endblock %}
2011

2112
{% block edit_content %}
2213

readthedocs/projects/urls/public.py

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,6 @@
1515
ProjectIndex.as_view(),
1616
name='projects_list'),
1717

18-
url(r'^search/autocomplete/$',
19-
public.search_autocomplete,
20-
name='search_autocomplete'),
21-
22-
url(r'^autocomplete/version/(?P<project_slug>[-\w]+)/$',
23-
public.version_autocomplete,
24-
name='version_autocomplete'),
25-
2618
url(r'^(?P<project_slug>{project_slug})/$'.format(**pattern_opts),
2719
ProjectDetailView.as_view(),
2820
name='projects_detail'),
@@ -45,11 +37,6 @@
4537
public.project_embed,
4638
name='project_embed'),
4739

48-
# url((r'^(?P<project_slug>{project_slug})/tools/analytics/$'
49-
# .format(**pattern_opts)),
50-
# public.project_analytics,
51-
# name='project_analytics'),
52-
5340
url(r'^(?P<project_slug>{project_slug})/search/$'.format(**pattern_opts),
5441
public.elastic_project_search,
5542
name='elastic_project_search'),
@@ -64,11 +51,6 @@
6451
build_views.BuildList.as_view(),
6552
name='builds_project_list'),
6653

67-
url((r'^(?P<project_slug>{project_slug})/autocomplete/file/$'
68-
.format(**pattern_opts)),
69-
public.file_autocomplete,
70-
name='file_autocomplete'),
71-
7254
url(r'^(?P<project_slug>{project_slug})/versions/$'.format(**pattern_opts),
7355
public.project_versions,
7456
name='project_version_list'),

readthedocs/projects/views/public.py

Lines changed: 0 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -196,85 +196,6 @@ def project_download_media(request, project_slug, type_, version_slug):
196196
return response
197197

198198

199-
def search_autocomplete(request):
200-
"""Return a json list of project names."""
201-
if 'term' in request.GET:
202-
term = request.GET['term']
203-
else:
204-
raise Http404
205-
queryset = Project.objects.public(
206-
request.user).filter(name__icontains=term)[:20]
207-
208-
ret_list = []
209-
for project in queryset:
210-
ret_list.append({
211-
'label': project.name,
212-
'value': project.slug,
213-
})
214-
215-
json_response = json.dumps(ret_list)
216-
return HttpResponse(json_response, content_type='text/javascript')
217-
218-
219-
def version_autocomplete(request, project_slug):
220-
"""Return a json list of version names."""
221-
queryset = Project.objects.public(request.user)
222-
get_object_or_404(queryset, slug=project_slug)
223-
versions = Version.objects.public(request.user)
224-
if 'term' in request.GET:
225-
term = request.GET['term']
226-
else:
227-
raise Http404
228-
version_queryset = versions.filter(slug__icontains=term)[:20]
229-
230-
names = version_queryset.values_list('slug', flat=True)
231-
json_response = json.dumps(list(names))
232-
233-
return HttpResponse(json_response, content_type='text/javascript')
234-
235-
236-
def version_filter_autocomplete(request, project_slug):
237-
queryset = Project.objects.public(request.user)
238-
project = get_object_or_404(queryset, slug=project_slug)
239-
versions = Version.objects.public(request.user)
240-
resp_format = request.GET.get('format', 'json')
241-
242-
if resp_format == 'json':
243-
names = versions.values_list('slug', flat=True)
244-
json_response = json.dumps(list(names))
245-
return HttpResponse(json_response, content_type='text/javascript')
246-
elif resp_format == 'html':
247-
return render(
248-
request,
249-
'core/version_list.html',
250-
{
251-
'project': project,
252-
'versions': versions,
253-
},
254-
)
255-
return HttpResponse(status=400)
256-
257-
258-
def file_autocomplete(request, project_slug):
259-
"""Return a json list of file names."""
260-
if 'term' in request.GET:
261-
term = request.GET['term']
262-
else:
263-
raise Http404
264-
queryset = ImportedFile.objects.filter(
265-
project__slug=project_slug, path__icontains=term)[:20]
266-
267-
ret_list = []
268-
for filename in queryset:
269-
ret_list.append({
270-
'label': filename.path,
271-
'value': filename.path,
272-
})
273-
274-
json_response = json.dumps(ret_list)
275-
return HttpResponse(json_response, content_type='text/javascript')
276-
277-
278199
def elastic_project_search(request, project_slug):
279200
"""Use elastic search to search in a project."""
280201
queryset = Project.objects.protected(request.user)

readthedocs/templates/core/widesearchbar.html

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ <h3>{% trans "Search all the docs" %}</h3>
99

1010
<form action="{% url "search" %}" method="GET">
1111
<div class="text-input-wrapper">
12-
<input type="text" name="q" value="{{ term }}" id="id_site_search" placeholder="{% trans 'Search Read the Docs' %}">
12+
<input type="text" name="q" value="{{ term }}" placeholder="{% trans 'Search Read the Docs' %}">
1313
</div>
1414
<div class="submit-input-wrapper">
1515
{% comment %} Translators: This is about starting a search {% endcomment %}
@@ -18,16 +18,4 @@ <h3>{% trans "Search all the docs" %}</h3>
1818
</form>
1919

2020
</div>
21-
</div>
22-
{% comment %}
23-
<script type="text/javascript">
24-
$('.wide-search-bar #id_site_search').autocomplete({
25-
source: '{% url "search_autocomplete" %}',
26-
minLength: 2,
27-
open: function(event, ui) {
28-
ac_top = $('.ui-autocomplete').css('top');
29-
$('.ui-autocomplete').css({'width': '534px', 'top': ac_top + 10 });
30-
}
31-
});
32-
</script>
33-
{% endcomment %}
21+
</div>

readthedocs/templates/projects/project_comments_settings.html

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -37,20 +37,10 @@ <h3> {% trans "Existing Translations" %} </h3>
3737
<input style="display: inline;" type="submit" value="{% trans "Submit" %}">
3838
</p>
3939
</form>
40+
41+
{% endcomment %}
4042
{% endblock %}
4143

4244

43-
{% block footerjs %}
44-
$('#id_project').autocomplete({
45-
source: '{% url "search_autocomplete" %}',
46-
minLength: 2,
47-
open: function(event, ui) {
48-
ac_top = $('.ui-autocomplete').css('top');
49-
$('.ui-autocomplete').css({'width': '233px', 'top': ac_top + 10 });
50-
}
51-
});
5245

53-
{% endcomment %}
5446

55-
56-
{% endblock %}

readthedocs/templates/search/base_facet.html

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,14 @@
44

55
{% block title %}{% blocktrans %}Search: {{ query }}{% endblocktrans %}{% endblock %}
66

7-
{% block extra_scripts %}
8-
<script type="text/javascript" src="{{ MEDIA_URL }}javascript/instantsearch.js"></script>
9-
<script type="text/javascript">
10-
$(function() {
11-
Search.init();
12-
});
13-
</script>
14-
{% endblock %}
15-
167
{% block content %}
178

189
<!-- BEGIN search form -->
1910
<div class="wide-search-bar">
2011
<div class="wide-search-bar-wrapper clearfix">
2112
<form action="." method="GET">
2213
<div class="text-input-wrapper">
23-
<input type="text" name="q" value="{{ query }}" autocomplete="off" id="id_site_search_2">
14+
<input type="text" name="q" value="{{ query }}">
2415
<input type="hidden" name="selected_facets" value="{{ selected_facets }}" id='id_selected_facets'>
2516
</div>
2617
<div class="submit-input-wrapper">

readthedocs/templates/search/elastic_project_search.html

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -10,32 +10,6 @@
1010
{% endwith %}
1111
{% endblock %}
1212

13-
{% block extra_scripts %}
14-
<script type="text/javascript">
15-
16-
$(document).ready(function() {
17-
input_div = $('#id_elastic_project_search')
18-
19-
$('#id_elastic_project_search').autocomplete({
20-
source: '{% url "file_autocomplete" project.slug %}',
21-
minLength: 2,
22-
open: function(event, ui) {
23-
ac_top = $('.ui-autocomplete').css('top');
24-
input_width = parseInt(input_div.css('width'))
25-
input_padding = parseInt(input_div.css('padding'))
26-
$('.ui-autocomplete').css({'cursor': 'pointer', 'width': input_width, 'padding': input_padding, 'top': ac_top + 10 });
27-
},
28-
select: function( event, ui ) {
29-
event.preventDefault()
30-
window.location.replace('/docs/' + '{{ project.slug }}' + '/en/latest/' + ui.item.value)
31-
}
32-
});
33-
34-
})
35-
</script>
36-
37-
38-
{% endblock %}
3913

4014
{% block content %}
4115

@@ -63,7 +37,7 @@ <h2 class="quiet">Search in this project:</h2>
6337
<div class="wide-search-bar-wrapper clearfix">
6438
<form action="." method="GET">
6539
<div class="text-input-wrapper">
66-
<input type="text" name="q" value="{{ query|default_if_none:"" }}" id="id_elastic_project_search">
40+
<input type="text" name="q" value="{{ query|default_if_none:"" }}">
6741
</div>
6842
<div class="submit-input-wrapper">
6943
{% comment %}Translators: This is about starting a search{% endcomment %}

0 commit comments

Comments
 (0)