Merge pull request #10153 from stsewd/check-if-search-progress-exists

Searchtools: don't assume that all themes define some elements
sphinx-doc · Apr 4, 2022 · b4276ed · b4276ed
2 parents dd8d029 + a45e4d4
commit b4276ed
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/sphinx/themes/basic/static/searchtools.js b/sphinx/themes/basic/static/searchtools.js
@@ -48,7 +48,7 @@ if (typeof Scorer === "undefined") {
 }
 
 const _removeChildren = (element) => {
-  while (element.lastChild) element.removeChild(element.lastChild);
+  while (element && element.lastChild) element.removeChild(element.lastChild);
 };
 
 /**
@@ -223,9 +223,11 @@ const Search = {
     Search.status = out.appendChild(searchSummary);
     Search.output = out.appendChild(searchList);
 
-    document.getElementById("search-progress").innerText = _(
-      "Preparing search..."
-    );
+    const searchProgress = document.getElementById("search-progress");
+    // Some themes don't use the search progress node
+    if (searchProgress) {
+      searchProgress.innerText = _("Preparing search...");
+    }
     Search.startPulse();
 
     // index already loaded, the browser was quick!