[toc2] ensure default config values are present in non-live notebooks

ipython-contrib · Dec 19, 2017 · 8e61312 · 8e61312 · jfbercher · Dec 19, 2017
1 parent 6dc75c3
commit 8e61312
Showing 1 changed file with 6 additions and 3 deletions.
diff --git 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