rename 'box' category 'box-violin'

Author: etpinard

src/components/legend/style.js

@@ -197,7 +197,7 @@ module.exports = function style(s, gd) {
         var trace = d[0].trace,
             pts = d3.select(this).select('g.legendpoints')
                 .selectAll('path.legendbox')
-                .data(Registry.traceIs(trace, 'box') && trace.visible ? [d] : []);
+                .data(Registry.traceIs(trace, 'box-violin') && trace.visible ? [d] : []);
         pts.enter().append('path').classed('legendbox', true)
             // if we want the median bar, prepend M6,0H-6
             .attr('d', 'M6,6H-6V-6H6Z')

src/components/modebar/manage.js

@@ -179,8 +179,8 @@ function isSelectable(fullData) {
             if(scatterSubTypes.hasMarkers(trace) || scatterSubTypes.hasText(trace)) {
                 selectable = true;
             }
-        } else if(Registry.traceIs(trace, 'box')) {
-            if(trace.boxpoints === 'all') {
+        } else if(Registry.traceIs(trace, 'box-violin')) {
+            if(trace.boxpoints === 'all' || trace.points === 'all') {
                 selectable = true;
             }
         }

src/plots/cartesian/type_defaults.js

@@ -75,7 +75,7 @@ function setAutoType(ax, data) {
 
         for(var i = 0; i < data.length; i++) {
             trace = data[i];
-            if(!Registry.traceIs(trace, 'box') ||
+            if(!Registry.traceIs(trace, 'box-violin') ||
                (trace[axLetter + 'axis'] || axLetter) !== id) continue;
 
             if(trace[posLetter] !== undefined) boxPositions.push(trace[posLetter][0]);
@@ -113,7 +113,7 @@ function getBoxPosLetter(trace) {
 
 function isBoxWithoutPositionCoords(trace, axLetter) {
     var posLetter = getBoxPosLetter(trace),
-        isBox = Registry.traceIs(trace, 'box'),
+        isBox = Registry.traceIs(trace, 'box-violin'),
         isCandlestick = Registry.traceIs(trace._fullInput || {}, 'candlestick');
 
     return (

src/traces/box/index.js

@@ -24,7 +24,7 @@ Box.selectPoints = require('./select');
 Box.moduleType = 'trace';
 Box.name = 'box';
 Box.basePlotModule = require('../../plots/cartesian');
-Box.categories = ['cartesian', 'symbols', 'oriented', 'box', 'showLegend'];
+Box.categories = ['cartesian', 'symbols', 'oriented', 'box-violin', 'showLegend'];
 Box.meta = {
     description: [
         'In vertical (horizontal) box plots,',

src/traces/box/set_positions.js

@@ -44,7 +44,7 @@ module.exports = function setPositions(gd, plotinfo) {
             t = cd[0].t;
             trace = cd[0].trace;
 
-            if(trace.visible === true && Registry.traceIs(trace, 'box') &&
+            if(trace.visible === true && trace.type === 'box' &&
                     !t.empty &&
                     trace.orientation === orientation &&
                     trace.xaxis === xa._id &&

src/traces/violin/index.js

@@ -23,9 +23,7 @@ module.exports = {
     moduleType: 'trace',
     name: 'violin',
     basePlotModule: require('../../plots/cartesian'),
-    // TODO
-    // - should maybe rename 'box' category to something more general
-    categories: ['cartesian', 'symbols', 'oriented', 'box', 'showLegend'],
+    categories: ['cartesian', 'symbols', 'oriented', 'box-violin', 'showLegend'],
     meta: {
         description: [
             'In vertical (horizontal) violin plots,',