Search: fix integration with latest sphinx

Ref #8871. To make this work we require: - sphinx-doc/sphinx#10153 - sphinx-doc/sphinx#10233 - A new release of https://github.com/readthedocs/readthedocs-sphinx-ext
readthedocs · Mar 3, 2022 · d21b46f · d21b46f
1 parent 7cf66f6
commit d21b46f
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 7 deletions.
diff --git a/readthedocs/core/static-src/core/js/doc-embed/search.js b/readthedocs/core/static-src/core/js/doc-embed/search.js
@@ -53,6 +53,17 @@ function attach_elastic_search_query_sphinx(data) {
         search_url.search = '?q=' + $.urlencode(query) + '&project=' + project +
                             '&version=' + version + '&language=' + language;
 
+        /*
+         * Compatibility function to set a text to a Node or JQuery object.
+         */
+        var setText = function (node, text) {
+          if (node.jquery) {
+            node.text(text);
+          } else {
+            node.innerText = text;
+          }
+        };
+
         search_def
             .then(function (data) {
                 var results = data.results || [];
@@ -61,7 +72,7 @@ function attach_elastic_search_query_sphinx(data) {
                     for (var i = 0; i < results.length; i += 1) {
                         var result = results[i];
                         var blocks = result.blocks;
-                        var list_item = $('<li style="display: none;"></li>');
+                        var list_item = $('<li>');
 
                         var title = result.title;
                         // if highlighted title is present, use that.
@@ -188,10 +199,14 @@ function attach_elastic_search_query_sphinx(data) {
                             }
                         }
 
-                        Search.output.append(list_item);
-                        list_item.slideDown(5);
+                        if (Search.output.jquery) {
+                          Search.output.append(list_item);
+                        } else {
+                          Search.output.appendChild(list_item.get(0));
+                        }
                     }
-                    Search.status.text(
+                    setText(
+                        Search.status,
                         _('Search finished, found %s page(s) matching the search query.').replace('%s', results.length)
                     );
                 } else {
@@ -206,8 +221,7 @@ function attach_elastic_search_query_sphinx(data) {
             .always(function () {
                 $('#search-progress').empty();
                 Search.stopPulse();
-                Search.title.text(_('Search Results'));
-                Search.status.fadeIn(500);
+                setText(Search.title, _('Search Results'))
             });
 
         $.ajax({