Merge branch 'master' into js-not-json

Author: etpinard

src/components/legend/index.js

@@ -12,6 +12,8 @@
 var Plotly = require('../../plotly');
 var d3 = require('d3');
 
+var styleOne = require('../../traces/pie/style_one');
+
 var legend = module.exports = {};
 
 legend.layoutAttributes = require('./attributes');
@@ -233,7 +235,7 @@ legend.pie = function(d) {
         .attr('transform', 'translate(20,0)');
     pts.exit().remove();
 
-    if(pts.size()) pts.call(Plotly.Pie.styleOne, d[0], trace);
+    if(pts.size()) pts.call(styleOne, d[0], trace);
 };
 
 legend.style = function(s) {

src/index.js

@@ -45,3 +45,20 @@ exports.Queue = Plotly.Queue;
 
 // export d3 used in the bundle
 exports.d3 = require('d3');
+
+Plotly.register([
+    require('./traces/bar'),
+    require('./traces/box'),
+    require('./traces/heatmap'),
+    require('./traces/histogram'),
+    require('./traces/histogram2d'),
+    require('./traces/histogram2dcontour'),
+    require('./traces/pie'),
+    require('./traces/contour'),
+    require('./traces/scatter3d'),
+    require('./traces/surface'),
+    require('./traces/mesh3d'),
+    require('./traces/scattergeo'),
+    require('./traces/choropleth'),
+    require('./traces/scattergl')
+]);