Merge pull request #120 from jdfreder/widgets

Hardcode widgets
jupyter · Jul 22, 2015 · c0f3b0a · c0f3b0a
2 parents 454a581 + fddd29f
commit c0f3b0a
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/notebook/notebookapp.py b/notebook/notebookapp.py
@@ -237,6 +237,20 @@ def init_handlers(self, settings):
         handlers.extend(load_handlers('services.nbconvert.handlers'))
         handlers.extend(load_handlers('services.kernelspecs.handlers'))
         handlers.extend(load_handlers('services.security.handlers'))
+
+        # BEGIN HARDCODED WIDGETS HACK
+        try:
+            import ipywidgets
+            handlers.append(
+                (r"/nbextensions/widgets/(.*)", FileFindHandler, {
+                    'path': ipywidgets.find_static_assets(),
+                    'no_cache_paths': ['/'], # don't cache anything in nbextensions
+                }),
+            )
+        except:
+            app_log.warn('ipywidgets package not installed.  Widgets are unavailable.')
+        # END HARDCODED WIDGETS HACK
+
         handlers.append(
             (r"/nbextensions/(.*)", FileFindHandler, {
                 'path': settings['nbextensions_path'],

diff --git a/notebook/static/notebook/js/main.js b/notebook/static/notebook/js/main.js
@@ -50,6 +50,14 @@ require([
     ) {
     "use strict";
 
+    // BEGIN HARDCODED WIDGETS HACK
+    // Don't include in above require call, avoiding r.js
+    // and crash on import failure.
+    require(['nbextensions/widgets/notebook/js/extension'], function(){}, function(err) {
+        console.error('ipywidgets package not installed.  Widgets are not available.');
+    });
+    // END HARDCODED WIDGETS HACK
+
     // compat with old IPython, remove for IPython > 3.0
     window.CodeMirror = CodeMirror;