Fix path and make mpl.js a UMD file

blink1073 · blink1073 · commit 566e97a33729 · 2016-05-02T10:37:55.000-05:00
diff --git a/lib/matplotlib/backends/web_backend/js/mpl.js b/lib/matplotlib/backends/web_backend/js/mpl.js
@@ -1,4 +1,16 @@
 /* Put everything inside the global mpl namespace */
+
+// Universal Module Definition
+(function (root, factory) {
+    if (typeof define === 'function' && define.amd) {
+        // AMD
+        define(['jquery'], factory);
+    } else {
+        // Browser globals (root is window)
+        root.returnExports = factory(root.jQuery);
+    }
+}(this, function ($) {
+
 window.mpl = {};
 
 
@@ -133,11 +145,11 @@ mpl.figure.prototype._init_canvas = function() {
     this.context = canvas[0].getContext("2d");
 
     var backingStore = this.context.backingStorePixelRatio ||
-	this.context.webkitBackingStorePixelRatio ||
-	this.context.mozBackingStorePixelRatio ||
-	this.context.msBackingStorePixelRatio ||
-	this.context.oBackingStorePixelRatio ||
-	this.context.backingStorePixelRatio || 1;
+    this.context.webkitBackingStorePixelRatio ||
+    this.context.mozBackingStorePixelRatio ||
+    this.context.msBackingStorePixelRatio ||
+    this.context.oBackingStorePixelRatio ||
+    this.context.backingStorePixelRatio || 1;
 
     mpl.ratio = (window.devicePixelRatio || 1) / backingStore;
 
@@ -552,3 +564,7 @@ mpl.figure.prototype.toolbar_button_onclick = function(name) {
 mpl.figure.prototype.toolbar_button_onmouseover = function(tooltip) {
     this.message.textContent = tooltip;
 };
+
+return mpl;
+
+}));
diff --git a/lib/matplotlib/backends/web_backend/js/nbagg_mpl.js b/lib/matplotlib/backends/web_backend/js/nbagg_mpl.js
@@ -1,5 +1,5 @@
 
-define(['jupyter-js-widgets', './mpl.js'], function(widgets, mpl) {
+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,5 +1,5 @@`
`1`	`1`
`2`		`-define(['jupyter-js-widgets', './mpl.js'], function(widgets, mpl) {`
	`2`	`+define(['jupyter-js-widgets', '/nbextensions/matplotlib/mpl.js'], function(widgets, mpl) {`
`3`	`3`
`4`	`4`	`var MPLCanvasView = widgets.WidgetView.extend({`
`5`	`5`