Merge pull request #33 from blink1073/fix-modules

Fix handling of module imports
matplotlib · Nov 20, 2017 · cbff39a · cbff39a
2 parents 95f49c9 + 4699b15
commit cbff39a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/js/src/index.js b/js/src/index.js
@@ -1,7 +1,5 @@
-var MPLCanvasModel = require('./mpl_widget').MPLCanvasModel;
-var MPLCanvasView = require('./mpl_widget').MPLCanvasView;
 
-module.exports = {
-    MPLCanvasModel: MPLCanvasModel,
-    MPLCanvasView: MPLCanvasView
-}
+// Export widget models and views, and the npm package version number.
+module.exports = require('./mpl_widget.js');
+module.exports['version'] = require('../package.json').version;
+
diff --git a/js/src/nb_index.js b/js/src/nb_index.js
@@ -8,5 +8,5 @@
 __webpack_public_path__ = document.querySelector('body').getAttribute('data-base-url') + 'nbextensions/jupyter-matplotlib/';
 
 // Export widget models and views, and the npm package version number.
-module.exports = require('./mpl_widget.js');
-module.exports['version'] = require('../package.json').version;
+module.exports = require('./index.js');
+