Clean up the includes

blink1073 · blink1073 · commit de652b71feb5 · 2016-05-02T11:52:05.000-05:00
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -1461,7 +1461,7 @@ def _jupyter_nbextension_paths():
         'section': 'notebook',
         'src': 'backends/web_backend/js',
         'dest': 'matplotlib',
-        'require': 'matplotlib/mpl'
+        'require': 'matplotlib/extension'
     }]
 
 
diff --git a/lib/matplotlib/backends/backend_nbagg.py b/lib/matplotlib/backends/backend_nbagg.py
@@ -128,7 +128,7 @@ def export(self):
 
 
 class FigureCanvasNbAgg(DOMWidget, FigureCanvasWebAggCore):
-    _view_module = Unicode("nbextensions/matplotlib/nbagg_mpl", sync=True)
+    _view_module = Unicode("matplotlib", sync=True)
     _view_name = Unicode('MPLCanvasView', sync=True)
     _toolbar_items = List(sync=True)
     _closed = Bool(True)
diff --git a/lib/matplotlib/backends/web_backend/js/extension.js b/lib/matplotlib/backends/web_backend/js/extension.js
@@ -0,0 +1,18 @@
+
+define([], function() {
+    if (window.require) {
+        window.require.config({
+            map: {
+                "*" : {
+                    "matplotlib": "nbextensions/matplotlib/nbagg_mpl",
+                    "jupyter-js-widgets": "nbextensions/jupyter-js-widgets/extension"
+                }
+            }
+        });
+    }
+
+    // Export the required load_ipython_extention
+    return {
+        load_ipython_extension: function() {}
+    };
+});
diff --git a/lib/matplotlib/backends/web_backend/js/nbagg_mpl.js b/lib/matplotlib/backends/web_backend/js/nbagg_mpl.js
@@ -1,4 +1,5 @@
 
+
 define(['jupyter-js-widgets', '/nbextensions/matplotlib/mpl.js'], function(widgets, mpl) {
 
     var MPLCanvasView = widgets.WidgetView.extend({

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`
	`2`	`+`
`2`	`3`	`define(['jupyter-js-widgets', '/nbextensions/matplotlib/mpl.js'], function(widgets, mpl) {`
`3`	`4`
`4`	`5`	`var MPLCanvasView = widgets.WidgetView.extend({`