Merge pull request #176 from SylvainCorlay/fixup-nbextension

Fixup nbextension
voila-dashboards · Jun 4, 2019 · 2bed7b3 · 2bed7b3
2 parents 36ff5de + af730ab
commit 2bed7b3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/etc/jupyter/nbconfig/notebook.d/voila.json b/etc/jupyter/nbconfig/notebook.d/voila.json
@@ -1,5 +1,5 @@
 {
     "load_extensions": {
-      "voila/nbextension": true
+      "voila/extension": true
     }
 }
diff --git a/setup.py b/setup.py
@@ -237,7 +237,9 @@ def run(self):
 
 data_files = [
     ('etc/jupyter/jupyter_server_config.d', ['etc/jupyter/jupyter_server_config.d/voila.json']),
-    ('etc/jupyter/jupyter_notebook_config.d', ['etc/jupyter/jupyter_notebook_config.d/voila.json'])
+    ('etc/jupyter/jupyter_notebook_config.d', ['etc/jupyter/jupyter_notebook_config.d/voila.json']),
+    ('etc/jupyter/nbconfig/notebook.d', ['etc/jupyter/nbconfig/notebook.d/voila.json']),
+    ('share/jupyter/nbextensions/voila', ['voila/static/extension.js'])
 ]
 
 # Add all the templates

diff --git a/voila/__init__.py b/voila/__init__.py
@@ -14,4 +14,4 @@ def _jupyter_nbextension_paths():
         section="notebook",
         src="static",
         dest="voila",
-        require="voila/nbextension")]
+        require="voila/extension")]
diff --git a/voila/static/nbextension.js → voila/static/extension.js b/voila/static/nbextension.js → voila/static/extension.js
@@ -1,9 +1,7 @@
 define(['jquery', 'base/js/namespace'], function($, Jupyter) {
     "use strict";
     var open_voila = function() {
-        let notebook_path =  Jupyter.notebook.notebook_path;
-        let voila_path = notebook_path.slice(0, notebook_path.length-6);  // without .ipynb
-        let voila_url = Jupyter.notebook.base_url + "voila/render/" + voila_path;
+        let voila_url = Jupyter.notebook.base_url + "voila/render/" + Jupyter.notebook.notebook_path;
         window.open(voila_url)
 
     }