Revert "Fix problem triggered by unconditional toctree call and empty…

… toctree" (#507) Fixes #374
readthedocs · Mar 11, 2021 · de76c03 · de76c03
1 parent 894aef5
commit de76c03
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 16 deletions.
diff --git a/sphinx_rtd_theme/layout.html b/sphinx_rtd_theme/layout.html
@@ -155,18 +155,12 @@
         {%- block navigation %}
         <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="{{ _('Main') }}">
           {%- block menu %}
-            {#-
-              The singlehtml builder doesn't handle this toctree call when the
-              toctree is empty. Skip building this for now.
-            #}
-            {%- if 'singlehtml' not in builder %}
-              {%- set global_toc = toctree(maxdepth=theme_navigation_depth|int,
-                                           collapse=theme_collapse_navigation|tobool,
-                                           includehidden=theme_includehidden|tobool,
-                                           titles_only=theme_titles_only|tobool) %}
-            {%- endif %}
-            {%- if global_toc %}
-              {{ global_toc }}
+            {%- set toctree = toctree(maxdepth=theme_navigation_depth|int,
+                                      collapse=theme_collapse_navigation|tobool,
+                                      includehidden=theme_includehidden|tobool,
+                                      titles_only=theme_titles_only|tobool) %}
+            {%- if toctree %}
+              {{ toctree }}
             {%- else %}
               <!-- Local TOC -->
               <div class="local-toc">{{ toc }}</div>

diff --git a/tests/test_builders.py b/tests/test_builders.py
@@ -30,12 +30,9 @@ def test_basic():
             assert search in content
         elif isinstance(app.builder, SingleFileHTMLBuilder):
             search = (
-                '<div class="local-toc"><ul>\n'
+                '<ul>\n'
                 '<li class="toctree-l1">'
                 '<a class="reference internal" href="index.html#document-foo">foo</a>'
-                '<ul>\n'
-                '<li class="toctree-l2">'
-                '<a class="reference internal" href="index.html#document-bar">bar</a>'
                 '</li>\n'
                 '</ul>'
             )