mv colorscale attributes out of colorbar/ into colorscale/

Author: etpinard

src/components/colorbar/colorbar.js

@@ -592,5 +592,3 @@ colorbar.traceColorbar = function(gd, cd) {
 
     Plotly.Lib.markTime('done colorbar');
 };
-
-colorbar.traceColorbarAttributes = require('./trace_attributes');

…/components/colorbar/trace_attributes.js src/components/colorscale/attributes.jssrc/components/colorbar/trace_attributes.js renamed to src/components/colorscale/attributes.js src/components/colorbar/trace_attributes.js renamed to src/components/colorscale/attributes.js

@@ -10,6 +10,8 @@ var colorscale = module.exports = {};
 colorscale.scales = require('./scales');
 colorscale.defaultScale = colorscale.scales.RdBu;
 
+colorscale.attributes = require('./attributes');
+
 function isValidScaleArray(scl) {
     var isValid = true,
         highestVal = 0,

src/components/colorscale/colorscale.js

@@ -1,5 +1,5 @@
 var ScatterGeoAttrs = require('../scattergeo/attributes');
-var traceColorbarAttrs = require('../../components/colorbar/trace_attributes');
+var colorscaleAttrs = require('../../components/colorscale/attributes');
 var plotAttrs = require('../../plots/plots/attributes');
 var extendFlat = require('../../lib/extend').extendFlat;
 
@@ -28,13 +28,13 @@ module.exports = {
             width: ScatterGeoMarkerLineAttrs.width
         }
     },
-    zauto: traceColorbarAttrs.zauto,
-    zmin: traceColorbarAttrs.zmin,
-    zmax: traceColorbarAttrs.zmax,
-    colorscale: traceColorbarAttrs.colorscale,
-    autocolorscale: traceColorbarAttrs.autocolorscale,
-    reversescale: traceColorbarAttrs.reversescale,
-    showscale: traceColorbarAttrs.showscale,
+    zauto: colorscaleAttrs.zauto,
+    zmin: colorscaleAttrs.zmin,
+    zmax: colorscaleAttrs.zmax,
+    colorscale: colorscaleAttrs.colorscale,
+    autocolorscale: colorscaleAttrs.autocolorscale,
+    reversescale: colorscaleAttrs.reversescale,
+    showscale: colorscaleAttrs.showscale,
     hoverinfo: extendFlat({}, plotAttrs.hoverinfo, {
         flags: ['location', 'z', 'text', 'name']
     }),

src/traces/choropleth/attributes.js

@@ -1,5 +1,5 @@
 var scatterAttrs = require('../scatter/attributes');
-var traceColorbarAttrs = require('../../components/colorbar/trace_attributes');
+var colorscaleAttrs = require('../../components/colorscale/attributes');
 
 var extendFlat = require('../../lib/extend').extendFlat;
 
@@ -47,14 +47,14 @@ module.exports = {
             '(the default behavior when `y` is not provided)'
         ].join(' ')
     },
-    zauto: traceColorbarAttrs.zauto,
-    zmin: traceColorbarAttrs.zmin,
-    zmax: traceColorbarAttrs.zmax,
-    colorscale: traceColorbarAttrs.colorscale,
-    autocolorscale: extendFlat({}, traceColorbarAttrs.autocolorscale,
+    zauto: colorscaleAttrs.zauto,
+    zmin: colorscaleAttrs.zmin,
+    zmax: colorscaleAttrs.zmax,
+    colorscale: colorscaleAttrs.colorscale,
+    autocolorscale: extendFlat({}, colorscaleAttrs.autocolorscale,
         {dflt: false}),
-    reversescale: traceColorbarAttrs.reversescale,
-    showscale: traceColorbarAttrs.showscale,
+    reversescale: colorscaleAttrs.reversescale,
+    showscale: colorscaleAttrs.showscale,
     zsmooth: {
         valType: 'enumerated',
         values: ['fast', 'best', false],

src/traces/heatmap/attributes.js

@@ -1,4 +1,4 @@
-var traceColorbarAttrs = require('../../components/colorbar/trace_attributes');
+var colorscaleAttrs = require('../../components/colorscale/attributes');
 
 module.exports = {
     x: {valType: 'data_array'},
@@ -74,9 +74,9 @@ module.exports = {
         }
     },
 
-    colorscale: traceColorbarAttrs.colorscale,
-    reversescale: traceColorbarAttrs.reversescale,
-    showscale: traceColorbarAttrs.showscale,
+    colorscale: colorscaleAttrs.colorscale,
+    reversescale: colorscaleAttrs.reversescale,
+    showscale: colorscaleAttrs.showscale,
 
     lighting: {
         ambient: {

src/traces/mesh3d/attributes.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var traceColorbarAttrs = require('../../components/colorbar/trace_attributes');
+var colorscaleAttrs = require('../../components/colorscale/attributes');
 var extendFlat = require('../../lib/extend').extendFlat;
 
 
@@ -86,14 +86,14 @@ module.exports = {
         valType: 'data_array',
         description: 'Sets the text elements associated with each z value.'
     },
-    zauto: traceColorbarAttrs.zauto,
-    zmin: traceColorbarAttrs.zmin,
-    zmax: traceColorbarAttrs.zmax,
-    colorscale: traceColorbarAttrs.colorscale,
-    autocolorscale: extendFlat({}, traceColorbarAttrs.autocolorscale,
+    zauto: colorscaleAttrs.zauto,
+    zmin: colorscaleAttrs.zmin,
+    zmax: colorscaleAttrs.zmax,
+    colorscale: colorscaleAttrs.colorscale,
+    autocolorscale: extendFlat({}, colorscaleAttrs.autocolorscale,
         {dflt: false}),
-    reversescale: traceColorbarAttrs.reversescale,
-    showscale: traceColorbarAttrs.showscale,
+    reversescale: colorscaleAttrs.reversescale,
+    showscale: colorscaleAttrs.showscale,
     contours: {
         x: makeContourAttr('x'),
         y: makeContourAttr('y'),