Merge pull request #517 from rtfd/fix-516

Correctly change current link in toctree if toplevel headers are on same page
readthedocs · Jan 16, 2018 · 266bc65 · 266bc65
2 parents 67e0b98 + 0bc0969
commit 266bc65
Showing 1 changed file with 31 additions and 27 deletions.
diff --git a/js/theme.js b/js/theme.js
@@ -114,36 +114,40 @@ function ThemeNav () {
 
     nav.reset = function () {
         // Get anchor from URL and open up nested nav
-        var anchor = encodeURI(window.location.hash);
-        if (anchor) {
-            try {
-                var link = $('.wy-menu-vertical')
-                    .find('[href="' + anchor + '"]');
-                // If we didn't find a link, it may be because we clicked on
-                // something that is not in the sidebar (eg: when using
-                // sphinxcontrib.httpdomain it generates headerlinks but those
-                // aren't picked up and placed in the toctree). So let's find
-                // the closest header in the document and try with that one.
-                if (link.length === 0) {
-                  var doc_link = $('.document a[href="' + anchor + '"]');
-                  var closest_section = doc_link.closest('div.section');
-                  // Try again with the closest section entry.
-                  link = $('.wy-menu-vertical')
-                    .find('[href="#' + closest_section.attr("id") + '"]');
-                }
-                // If we found a matching link then reset current and re-apply
-                // otherwise retain the existing match
-                if (link.length > 0) {
-                    $('.wy-menu-vertical li.toctree-l1 li.current').removeClass('current');
-                    link.closest('li.toctree-l2').addClass('current');
-                    link.closest('li.toctree-l3').addClass('current');
-                    link.closest('li.toctree-l4').addClass('current');
-                }
+        var anchor = encodeURI(window.location.hash) || '#';
+
+        try {
+            var link = $('.wy-menu-vertical')
+                .find('[href="' + anchor + '"]');
+            // If we didn't find a link, it may be because we clicked on
+            // something that is not in the sidebar (eg: when using
+            // sphinxcontrib.httpdomain it generates headerlinks but those
+            // aren't picked up and placed in the toctree). So let's find
+            // the closest header in the document and try with that one.
+            if (link.length === 0) {
+              var doc_link = $('.document a[href="' + anchor + '"]');
+              var closest_section = doc_link.closest('div.section');
+              // Try again with the closest section entry.
+              link = $('.wy-menu-vertical')
+                .find('[href="#' + closest_section.attr("id") + '"]');
             }
-            catch (err) {
-                console.log("Error expanding nav for anchor", err);
+            // If we found a matching link then reset current and re-apply
+            // otherwise retain the existing match
+            if (link.length > 0) {
+                $('.wy-menu-vertical .current').removeClass('current');
+                link.addClass('current');
+                link.closest('li.toctree-l1').addClass('current');
+                link.closest('li.toctree-l1').parent().addClass('current');
+                link.closest('li.toctree-l1').addClass('current');
+                link.closest('li.toctree-l2').addClass('current');
+                link.closest('li.toctree-l3').addClass('current');
+                link.closest('li.toctree-l4').addClass('current');
             }
         }
+        catch (err) {
+            console.log("Error expanding nav for anchor", err);
+        }
+
     };
 
     nav.onScroll = function () {