Fix TOC toggling

tmcw · tmcw · commit 2497ea3f48a0 · 2016-09-12T15:25:39.000-07:00
diff --git a/default_theme/assets/site.js b/default_theme/assets/site.js
@@ -54,28 +54,46 @@ for (var i = 0; i < toggleLinks.length; i++) {
 }
 
 function toggle() {
-  var target = document.querySelector('[data-namespacecontent="' + this.dataset.namespacetarget + '"]');
-  var caret = this.getElementsByClassName('caret')[0];
+  toggleSection(this.dataset.namespacetarget);
+}
+
+function toggleSection(id, yn) {
+  var target = document.querySelector('[data-namespacecontent="' + id + '"]');
+  if (!target) {
+    return;
+  }
   var klass = 'section-nested';
-  if (target.classList.contains(klass)) {
+  yn = typeof yn === 'boolean' ? yn : target.classList.contains(klass);
+  if (yn) {
     target.classList.remove(klass);
-    caret.innerHTML = '+';
   } else {
     target.classList.add(klass);
-    caret.innerHTML = '-';
   }
 }
 
-function showHashTarget(targetId) {
-  var hashTarget = document.getElementById(targetId);
-  // new target is hidden
-  if (hashTarget && hashTarget.offsetHeight === 0 &&
-    hashTarget.parentNode.parentNode.classList.contains('display-none')) {
-    hashTarget.parentNode.parentNode.classList.remove('display-none');
+var items = document.getElementsByClassName('toggle-sibling');
+for (var j = 0; j < items.length; j++) {
+  items[j].addEventListener('click', toggleSibling);
+}
+
+function toggleSibling() {
+  var stepSibling = this.parentNode.getElementsByClassName('toggle-target')[0];
+  var icon = this.getElementsByClassName('icon')[0];
+  var klass = 'display-none';
+  if (stepSibling.classList.contains(klass)) {
+    stepSibling.classList.remove(klass);
+    icon.innerHTML = '▾';
+  } else {
+    stepSibling.classList.add(klass);
+    icon.innerHTML = '▸';
   }
 }
 
-window.addEventListener('hashchange', function() {
+function showHashTarget(targetId) {
+  toggleSection(targetId, false);
+}
+
+window.addEventListener('hashchange', function () {
   showHashTarget(location.hash.substring(1));
 });
 
diff --git a/default_theme/assets/style.css b/default_theme/assets/style.css
@@ -104,13 +104,10 @@ h4:hover .anchorjs-link {
   box-sizing: border-box;
 }
 
-.hide-target {
-  display: none;
-}
-
-.section-nested .hide-target {
-  display: block;
-}
+.hide-target { display: none; }
+.section-nested .hide-target { display: block; }
+.show-target { display: inline; }
+.section-nested .show-target { display: none; }
 
 .section-nested {
   padding-bottom: 10px;
diff --git a/default_theme/section._ b/default_theme/section._
@@ -16,7 +16,7 @@
       <% } %>
     <% } else { %>
       <div data-namespacetarget='<%- section.namespace %>' class='no-select py1 small pointer'>
-        <a class='caret'>+</a>
+        <a class='caret'><span class='hide-target'>-</span><span class='show-target'>+</span></a>
         <span class='code truncate bold-target'><%= formatters.shortSignature(section) %></span>
       </div>
     <% } %>
