From 4b05d07fb7fdfef1a787d8716044afb20bc655d5 Mon Sep 17 00:00:00 2001
From: John Mulhausen <john@docker.com>
Date: Tue, 15 Nov 2016 11:49:18 -0800
Subject: [PATCH 1/2] Pre-render nav

---
 _includes/tree.html | 2 +-
 _layouts/docs.html  | 3 ++-
 js/menu.js          | 3 +++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/_includes/tree.html b/_includes/tree.html
index 94727832d7..6adacc83f8 100644
--- a/_includes/tree.html
+++ b/_includes/tree.html
@@ -1,4 +1,4 @@
-{% for item in tree %}{% if item.heading %}{% else %}{% if item.sectiontitle %}<li class="leaf menu-closed"><a href="/" class="expand-menu "><span class="menu-icon" aria-hidden="true"></span>{{ item.sectiontitle }}</a>
+{% for item in tree %}{% if item.heading %}{% else %}{% if item.sectiontitle %}<li class="leaf menu-closed"><a href="#" class="expand-menu "><span class="menu-icon" aria-hidden="true"></span>{{ item.sectiontitle }}</a>
 <ul class="nav-sub">
   {% assign tree = item.section %}{% include tree.html %}
 </ul>
diff --git a/_layouts/docs.html b/_layouts/docs.html
index 6652d6feaf..d2c8834ce9 100644
--- a/_layouts/docs.html
+++ b/_layouts/docs.html
@@ -187,7 +187,8 @@ ng\:form {
           <div class="row">
             <div class="col-xs-12 col-sm-3 col-md-2 col-xl-2 docsidebarnav_section">
               <div class="region region-hero-sub"><ul class="nav-sub">
-
+								{% assign tree = site.data.toc.toc %}
+								{% include tree.html %}
 							</ul>
               </div>
             </div>
diff --git a/js/menu.js b/js/menu.js
index b2e186df72..3931f9aed0 100644
--- a/js/menu.js
+++ b/js/menu.js
@@ -41,12 +41,15 @@ function hookupTOCEvents()
   });
 }
 jQuery(document).ready(function(){
+  /*
     $.getJSON( "/toc.txt", function( data ) {
       tocData = data;
       renderTree(data.toc);
       $(".nav-sub").html(treeOutput.join(''));
       hookupTOCEvents();
     });
+    */
+    hookupTOCEvents();
     $("#TableOfContents ul").empty();
 
     var prevH2Item = null;

From d549e4c504099f9b858014fbc61cbb382a2b1389 Mon Sep 17 00:00:00 2001
From: John Mulhausen <john@docker.com>
Date: Wed, 16 Nov 2016 11:25:36 -0800
Subject: [PATCH 2/2] Remove references to toc.txt

---
 js/menu.js | 30 ------------------------------
 toc.txt    |  4 ----
 2 files changed, 34 deletions(-)
 delete mode 100644 toc.txt

diff --git a/js/menu.js b/js/menu.js
index 3931f9aed0..2d4a47778d 100644
--- a/js/menu.js
+++ b/js/menu.js
@@ -1,26 +1,4 @@
 var tocData;
-var treeOutput = new Array();
-function renderTree(tree)
-{
-  for (var i=0; i < tree.length; i++)
-  {
-    if (tree[i].heading)
-    {
-      // render a heading
-    } else {
-      if (tree[i].sectiontitle) {
-        treeOutput.push('<li class="leaf menu-closed"><a href="#" class="expand-menu "><span class="menu-icon" aria-hidden="true"></span>' + tree[i].sectiontitle + '</a>');
-        treeOutput.push('<ul class="nav-sub">');
-        renderTree(tree[i].section);
-        treeOutput.push('</ul>');
-      } else {
-        treeOutput.push('<li class="leaf"><a href="' + tree[i].path +'" class="');
-        if (tree[i].path == window.location.pathname) treeOutput.push('active currentPage');
-        treeOutput.push('">' + tree[i].title + '</a></li>');
-      }
-    }
-  }
-}
 function hookupTOCEvents()
 {
   // do after tree render
@@ -41,14 +19,6 @@ function hookupTOCEvents()
   });
 }
 jQuery(document).ready(function(){
-  /*
-    $.getJSON( "/toc.txt", function( data ) {
-      tocData = data;
-      renderTree(data.toc);
-      $(".nav-sub").html(treeOutput.join(''));
-      hookupTOCEvents();
-    });
-    */
     hookupTOCEvents();
     $("#TableOfContents ul").empty();
 
diff --git a/toc.txt b/toc.txt
deleted file mode 100644
index 8d338bf0d7..0000000000
--- a/toc.txt
+++ /dev/null
@@ -1,4 +0,0 @@
----
-layout: null
----
-{{ site.data.toc | jsonify }}