From 6dc75c30d2fe87fba3fee446aa0265f26d0a6895 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Bercher?=
 <jfbercher@users.noreply.github.com>
Date: Sun, 17 Dec 2017 16:21:26 +0100
Subject: [PATCH 1/2] Undefined title_sidebar

In some "old" exported html files, with toc2 embedded, the `cfg.title_sidebar` is not defined; This tests for the cfg key and define it if necessary (Otherwise the sidebar title appears as "undefined")
---
 src/jupyter_contrib_nbextensions/nbextensions/toc2/toc2.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/jupyter_contrib_nbextensions/nbextensions/toc2/toc2.js b/src/jupyter_contrib_nbextensions/nbextensions/toc2/toc2.js
index 4e2af32af..eee892492 100644
--- a/src/jupyter_contrib_nbextensions/nbextensions/toc2/toc2.js
+++ b/src/jupyter_contrib_nbextensions/nbextensions/toc2/toc2.js
@@ -537,6 +537,9 @@
         var ul = $('<ul/>').addClass('toc-item');
 
         // update sidebar/window title
+        if (typeof cfg.title_sidebar === 'undefined') { // For backwards compatibility: 
+            cfg.title_sidebar = "Contents"  // May not be defined in some non-live notebooks
+        };
         $('#toc-header > .header').text(cfg.title_sidebar + ' ');
 
         // update toc element

From 8e61312fa9764039261ef3a9ccce124a13d642ea Mon Sep 17 00:00:00 2001
From: Josh Barnes <joshuacookebarnes@gmail.com>
Date: Tue, 19 Dec 2017 13:39:21 +0000
Subject: [PATCH 2/2] [toc2] ensure default config values are present in
 non-live notebooks

---
 .../nbextensions/toc2/toc2.js                            | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/jupyter_contrib_nbextensions/nbextensions/toc2/toc2.js b/src/jupyter_contrib_nbextensions/nbextensions/toc2/toc2.js
index eee892492..0858cd085 100644
--- a/src/jupyter_contrib_nbextensions/nbextensions/toc2/toc2.js
+++ b/src/jupyter_contrib_nbextensions/nbextensions/toc2/toc2.js
@@ -529,6 +529,12 @@
             return
         }
 
+        // In a live notebook, read_config will have been called already, but
+        // in non-live notebooks, ensure that all config values are defined.
+        if (!liveNotebook) {
+            cfg = $.extend(true, {}, default_cfg, cfg);
+        }
+
         var toc_wrapper = $("#toc-wrapper");
         if (toc_wrapper.length === 0) { // toc window doesn't exist at all
             create_toc_div(cfg, st); // create it
@@ -537,9 +543,6 @@
         var ul = $('<ul/>').addClass('toc-item');
 
         // update sidebar/window title
-        if (typeof cfg.title_sidebar === 'undefined') { // For backwards compatibility: 
-            cfg.title_sidebar = "Contents"  // May not be defined in some non-live notebooks
-        };
         $('#toc-header > .header').text(cfg.title_sidebar + ' ');
 
         // update toc element