From 0cb252392712ea1f2489fbc1283a62112d17d0a3 Mon Sep 17 00:00:00 2001
From: Ryan P Kilby <kilbyr@gmail.com>
Date: Tue, 16 Jul 2019 13:00:45 -0700
Subject: [PATCH] Update docs search plugin (#6810)

---
 docs_theme/js/theme.js | 6 ------
 docs_theme/main.html   | 9 ++++++---
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/docs_theme/js/theme.js b/docs_theme/js/theme.js
index ddbd9c905..0918ae85d 100644
--- a/docs_theme/js/theme.js
+++ b/docs_theme/js/theme.js
@@ -9,11 +9,6 @@ var getSearchTerm = function() {
   }
 };
 
-var initilizeSearch = function() {
-  require.config({ baseUrl: '/mkdocs/js' });
-  require(['search']);
-};
-
 $(function() {
   var searchTerm = getSearchTerm(),
     $searchModal = $('#mkdocs_search_modal'),
@@ -30,6 +25,5 @@ $(function() {
 
   $searchModal.on('shown', function() {
     $searchQuery.focus();
-    initilizeSearch();
   });
 });
diff --git a/docs_theme/main.html b/docs_theme/main.html
index 4a1b0f23c..21e9171a2 100644
--- a/docs_theme/main.html
+++ b/docs_theme/main.html
@@ -138,14 +138,17 @@
   <!-- Le javascript
   ================================================== -->
   <!-- Placed at the end of the document so the pages load faster -->
+  <script async src="https://fund.django-rest-framework.org/sidebar_include.js"></script>
   <script src="{{ base_url }}/js/jquery-1.8.1-min.js"></script>
   <script src="{{ base_url }}/js/prettify-1.0.js"></script>
   <script src="{{ base_url }}/js/bootstrap-2.1.1-min.js"></script>
-  <script async src="https://fund.django-rest-framework.org/sidebar_include.js"></script>
-  <script>var base_url = '{{ base_url }}';</script>
-  <script src="{{ base_url }}/mkdocs/js/require.js"></script>
   <script src="{{ base_url }}/js/theme.js"></script>
 
+  <script>var base_url = '{{ base_url }}';</script>
+  {% for path in config.extra_javascript %}
+  <script src="{{ path|url }}" defer></script>
+  {% endfor %}
+
   <script>
     var shiftWindow = function() {
       scrollBy(0, -50)