Merge pull request #3805 from rajujha373/remove_autocomplete

#3779: Remove autocomplete js from templates

Author: ericholscher

media/javascript/instantsearch.js

@@ -8,15 +8,6 @@
 Gold Projects
 {% endblock %}
 
-{% block extra_scripts %}
-  <script type="text/javascript" src="{% static 'core/js/autocomplete.js' %}"></script>
-  <script type="text/javascript">
-var attach_project_autocomplete = require('core/autocomplete');
-$(document).ready(function () {
-  attach_project_autocomplete('#id_project', '{% url "search_autocomplete" %}');
-});
-  </script>
-{% endblock %}
 
 {% block edit_content %}
 

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

@@ -15,14 +15,6 @@
         ProjectIndex.as_view(),
         name='projects_list'),
 
-    url(r'^search/autocomplete/$',
-        public.search_autocomplete,
-        name='search_autocomplete'),
-
-    url(r'^autocomplete/version/(?P<project_slug>[-\w]+)/$',
-        public.version_autocomplete,
-        name='version_autocomplete'),
-
     url(r'^(?P<project_slug>{project_slug})/$'.format(**pattern_opts),
         ProjectDetailView.as_view(),
         name='projects_detail'),
@@ -45,11 +37,6 @@
         public.project_embed,
         name='project_embed'),
 
-    # url((r'^(?P<project_slug>{project_slug})/tools/analytics/$'
-    #      .format(**pattern_opts)),
-    #     public.project_analytics,
-    #     name='project_analytics'),
-
     url(r'^(?P<project_slug>{project_slug})/search/$'.format(**pattern_opts),
         public.elastic_project_search,
         name='elastic_project_search'),
@@ -64,11 +51,6 @@
         build_views.BuildList.as_view(),
         name='builds_project_list'),
 
-    url((r'^(?P<project_slug>{project_slug})/autocomplete/file/$'
-         .format(**pattern_opts)),
-        public.file_autocomplete,
-        name='file_autocomplete'),
-
     url(r'^(?P<project_slug>{project_slug})/versions/$'.format(**pattern_opts),
         public.project_versions,
         name='project_version_list'),

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

@@ -199,85 +199,6 @@ def project_download_media(request, project_slug, type_, version_slug):
         return response
 
 
-def search_autocomplete(request):
-    """Return a json list of project names."""
-    if 'term' in request.GET:
-        term = request.GET['term']
-    else:
-        raise Http404
-    queryset = Project.objects.public(
-        request.user).filter(name__icontains=term)[:20]
-
-    ret_list = []
-    for project in queryset:
-        ret_list.append({
-            'label': project.name,
-            'value': project.slug,
-        })
-
-    json_response = json.dumps(ret_list)
-    return HttpResponse(json_response, content_type='text/javascript')
-
-
-def version_autocomplete(request, project_slug):
-    """Return a json list of version names."""
-    queryset = Project.objects.public(request.user)
-    get_object_or_404(queryset, slug=project_slug)
-    versions = Version.objects.public(request.user)
-    if 'term' in request.GET:
-        term = request.GET['term']
-    else:
-        raise Http404
-    version_queryset = versions.filter(slug__icontains=term)[:20]
-
-    names = version_queryset.values_list('slug', flat=True)
-    json_response = json.dumps(list(names))
-
-    return HttpResponse(json_response, content_type='text/javascript')
-
-
-def version_filter_autocomplete(request, project_slug):
-    queryset = Project.objects.public(request.user)
-    project = get_object_or_404(queryset, slug=project_slug)
-    versions = Version.objects.public(request.user)
-    resp_format = request.GET.get('format', 'json')
-
-    if resp_format == 'json':
-        names = versions.values_list('slug', flat=True)
-        json_response = json.dumps(list(names))
-        return HttpResponse(json_response, content_type='text/javascript')
-    elif resp_format == 'html':
-        return render(
-            request,
-            'core/version_list.html',
-            {
-                'project': project,
-                'versions': versions,
-            },
-        )
-    return HttpResponse(status=400)
-
-
-def file_autocomplete(request, project_slug):
-    """Return a json list of file names."""
-    if 'term' in request.GET:
-        term = request.GET['term']
-    else:
-        raise Http404
-    queryset = ImportedFile.objects.filter(
-        project__slug=project_slug, path__icontains=term)[:20]
-
-    ret_list = []
-    for filename in queryset:
-        ret_list.append({
-            'label': filename.path,
-            'value': filename.path,
-        })
-
-    json_response = json.dumps(ret_list)
-    return HttpResponse(json_response, content_type='text/javascript')
-
-
 def elastic_project_search(request, project_slug):
     """Use elastic search to search in a project."""
     queryset = Project.objects.protected(request.user)

readthedocs/gold/templates/gold/projects.html

@@ -58,7 +58,6 @@
     require('jquery');
   </script>
 
-  <script src="{{ MEDIA_URL }}javascript/instantsearch.js"></script>
   <script src="{{ MEDIA_URL }}javascript/base.js"></script>
   <script src="{% static 'core/js/site.js' %}"></script>
   <script>