From 0b6f07108570396d9fd29f4094fb6c60e0e8c87f Mon Sep 17 00:00:00 2001
From: Josh Barnes <joshuacookebarnes@gmail.com>
Date: Mon, 18 Sep 2017 21:14:51 +0100
Subject: [PATCH] [toc2] use require to get events

---
 .../nbextensions/toc2/main.js                      | 14 ++++++++------
 .../nbextensions/toc2/toc2.js                      |  8 ++++----
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/jupyter_contrib_nbextensions/nbextensions/toc2/main.js b/src/jupyter_contrib_nbextensions/nbextensions/toc2/main.js
index 07f8ad6..6badc21 100644
--- a/src/jupyter_contrib_nbextensions/nbextensions/toc2/main.js
+++ b/src/jupyter_contrib_nbextensions/nbextensions/toc2/main.js
@@ -6,12 +6,14 @@ define([
     'require',
     'jquery',
     'base/js/namespace',
+    'base/js/events',
     'notebook/js/codecell',
     'nbextensions/toc2/toc2'
 ], function(
     require,
     $,
     IPython,
+    events,
     codecell,
     toc2
 ) {
@@ -122,7 +124,7 @@ define([
 
     var toc_button = function() {
         if (!IPython.toolbar) {
-            $([IPython.events]).on("app_initialized.NotebookApp", toc_button);
+            events.on("app_initialized.NotebookApp", toc_button);
             return;
         }
         if ($("#toc_button").length === 0) {
@@ -215,16 +217,16 @@ define([
             table_of_contents(cfg, st);
         }); // called after config is stable           
         // event: render toc for each markdown cell modification
-        $([IPython.events]).on("rendered.MarkdownCell",
+        events.on("rendered.MarkdownCell",
             function(evt, data) {
                 table_of_contents(cfg, st); // recompute the toc
                 rehighlight_running_cells() // re-highlight running cells
                 highlight_toc_item(evt, data); // and of course the one currently rendered
             });
         // event: on cell selection, highlight the corresponding item
-        $([IPython.events]).on('select.Cell', highlight_toc_item)
+        events.on('select.Cell', highlight_toc_item);
             // event: if kernel_ready (kernel change/restart): add/remove a menu item
-        $([IPython.events]).on("kernel_ready.Kernel", function() {
+        events.on("kernel_ready.Kernel", function() {
             addSaveAsWithToc();
         })
 
@@ -233,7 +235,7 @@ define([
         // 
         // Highlight cell on execution
         patch_CodeCell_get_callbacks()
-        $([Jupyter.events]).on('execute.CodeCell', excute_codecell_callback);
+        events.on('execute.CodeCell', excute_codecell_callback);
     }
 
 
@@ -248,7 +250,7 @@ define([
             toc_init();
         } else {
             console.log("[toc2] Waiting for notebook availability")
-            $([Jupyter.events]).on("notebook_loaded.Notebook", function() {
+            events.on("notebook_loaded.Notebook", function() {
                 console.log("[toc2] toc2 initialized (via notebook_loaded)")
                 toc_init();
             })
diff --git a/src/jupyter_contrib_nbextensions/nbextensions/toc2/toc2.js b/src/jupyter_contrib_nbextensions/nbextensions/toc2/toc2.js
index 62c6cd4..f4e1737 100644
--- a/src/jupyter_contrib_nbextensions/nbextensions/toc2/toc2.js
+++ b/src/jupyter_contrib_nbextensions/nbextensions/toc2/toc2.js
@@ -129,7 +129,7 @@
             $('#navigate_menu').css('height', $('#Navigate_menu').height())
         } else {
             IPython.notebook.metadata.toc.nav_menu = {};
-            $([IPython.events]).on("before_save.Notebook",
+            events.on("before_save.Notebook",
                 function() {
                     try {
                         IPython.notebook.metadata.toc.nav_menu['width'] = $('#Navigate_menu').css('width')
@@ -297,10 +297,10 @@
         // On header/menu/toolbar resize, resize the toc itself
         // (if displayed as a sidebar)
         if (liveNotebook) {
-            $([Jupyter.events]).on("resize-header.Page", function() {
+            events.on("resize-header.Page", function() {
                 setSideBarHeight(cfg, st);
             });
-            $([Jupyter.events]).on("toggle-all-headers", function() {
+            events.on("toggle-all-headers", function() {
                 setSideBarHeight(cfg, st);
             });
         }
@@ -402,7 +402,7 @@
         // On header/menu/toolbar resize, resize the toc itself
         // (if displayed as a sidebar)
         if (liveNotebook) {
-            $([Jupyter.events]).on("resize-header.Page toggle-all-headers", function() {
+            events.on("resize-header.Page toggle-all-headers", function() {
                 setSideBarHeight(cfg, st);
             });
         }