581a dry colors - plug in colorscale/

Author: monfera

src/traces/choropleth/attributes.js

@@ -15,7 +15,7 @@ var extendFlat = require('../../lib/extend').extendFlat;
 
 var ScatterGeoMarkerLineAttrs = ScatterGeoAttrs.marker.line;
 
-module.exports = {
+module.exports = extendFlat({}, colorscaleAttrs, {
     locations: {
         valType: 'data_array',
         description: [
@@ -38,17 +38,10 @@ module.exports = {
             width: ScatterGeoMarkerLineAttrs.width
         }
     },
-    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']
     }),
     _nestedModules: {
         'colorbar': 'Colorbar'
     }
-};
+});

src/traces/contour/attributes.js

@@ -10,11 +10,12 @@
 
 var heatmapAttrs = require('../heatmap/attributes');
 var scatterAttrs = require('../scatter/attributes');
+var colorscaleAttrs = require('../../components/colorscale/attributes');
 var extendFlat = require('../../lib/extend').extendFlat;
 
 var scatterLineAttrs = scatterAttrs.line;
 
-module.exports = {
+module.exports = extendFlat({}, colorscaleAttrs, {
     z: heatmapAttrs.z,
     x: heatmapAttrs.x,
     x0: heatmapAttrs.x0,
@@ -27,14 +28,6 @@ module.exports = {
     xtype: heatmapAttrs.xtype,
     ytype: heatmapAttrs.ytype,
 
-    zauto: heatmapAttrs.zauto,
-    zmin: heatmapAttrs.zmin,
-    zmax: heatmapAttrs.zmax,
-    colorscale: heatmapAttrs.colorscale,
-    autocolorscale: heatmapAttrs.autocolorscale,
-    reversescale: heatmapAttrs.reversescale,
-    showscale: heatmapAttrs.showscale,
-
     connectgaps: heatmapAttrs.connectgaps,
 
     autocontour: {
@@ -122,4 +115,4 @@ module.exports = {
     _nestedModules: {
         'colorbar': 'Colorbar'
     }
-};
+});

src/traces/heatmap/attributes.js

@@ -14,13 +14,9 @@ var colorscaleAttrs = require('../../components/colorscale/attributes');
 var extendFlat = require('../../lib/extend').extendFlat;
 
 
-module.exports = extendFlat(
-    {},
+module.exports = extendFlat({},
     colorscaleAttrs,
-    {
-        autocolorscale: extendFlat({}, colorscaleAttrs.autocolorscale,
-            {dflt: false})
-    },
+    {autocolorscale: extendFlat({}, colorscaleAttrs.autocolorscale, {dflt: false})},
     {
         z: {
             valType: 'data_array',

src/traces/histogram2d/attributes.js

@@ -10,42 +10,40 @@
 
 var histogramAttrs = require('../histogram/attributes');
 var heatmapAttrs = require('../heatmap/attributes');
+var colorscaleAttrs = require('../../components/colorscale/attributes');
 
-module.exports = {
-    x: histogramAttrs.x,
-    y: histogramAttrs.y,
+var extendFlat = require('../../lib/extend').extendFlat;
 
-    z: {
-        valType: 'data_array',
-        description: 'Sets the aggregation data.'
-    },
-    marker: {
-        color: {
+module.exports = extendFlat({},
+    colorscaleAttrs,
+    {autocolorscale: extendFlat({}, colorscaleAttrs.autocolorscale, {dflt: false})},
+    {
+        x: histogramAttrs.x,
+        y: histogramAttrs.y,
+
+        z: {
             valType: 'data_array',
             description: 'Sets the aggregation data.'
+        },
+        marker: {
+            color: {
+                valType: 'data_array',
+                description: 'Sets the aggregation data.'
+            }
+        },
+
+        histnorm: histogramAttrs.histnorm,
+        histfunc: histogramAttrs.histfunc,
+        autobinx: histogramAttrs.autobinx,
+        nbinsx: histogramAttrs.nbinsx,
+        xbins: histogramAttrs.xbins,
+        autobiny: histogramAttrs.autobiny,
+        nbinsy: histogramAttrs.nbinsy,
+        ybins: histogramAttrs.ybins,
+
+        zsmooth: heatmapAttrs.zsmooth,
+
+        _nestedModules: {
+            'colorbar': 'Colorbar'
         }
-    },
-
-    histnorm: histogramAttrs.histnorm,
-    histfunc: histogramAttrs.histfunc,
-    autobinx: histogramAttrs.autobinx,
-    nbinsx: histogramAttrs.nbinsx,
-    xbins: histogramAttrs.xbins,
-    autobiny: histogramAttrs.autobiny,
-    nbinsy: histogramAttrs.nbinsy,
-    ybins: histogramAttrs.ybins,
-
-    zauto: heatmapAttrs.zauto,
-    zmin: heatmapAttrs.zmin,
-    zmax: heatmapAttrs.zmax,
-    colorscale: heatmapAttrs.colorscale,
-    autocolorscale: heatmapAttrs.autocolorscale,
-    reversescale: heatmapAttrs.reversescale,
-    showscale: heatmapAttrs.showscale,
-
-    zsmooth: heatmapAttrs.zsmooth,
-
-    _nestedModules: {
-        'colorbar': 'Colorbar'
-    }
-};
+    });

src/traces/histogram2dcontour/attributes.js

@@ -10,8 +10,11 @@
 
 var histogram2dAttrs = require('../histogram2d/attributes');
 var contourAttrs = require('../contour/attributes');
+var colorscaleAttrs = require('../../components/colorscale/attributes');
 
-module.exports = {
+var extendFlat = require('../../lib/extend').extendFlat;
+
+module.exports = extendFlat({}, colorscaleAttrs, {
     x: histogram2dAttrs.x,
     y: histogram2dAttrs.y,
     z: histogram2dAttrs.z,
@@ -26,14 +29,6 @@ module.exports = {
     nbinsy: histogram2dAttrs.nbinsy,
     ybins: histogram2dAttrs.ybins,
 
-    zauto: contourAttrs.zauto,
-    zmin: contourAttrs.zmin,
-    zmax: contourAttrs.zmax,
-    colorscale: contourAttrs.colorscale,
-    autocolorscale: contourAttrs.autocolorscale,
-    reversescale: contourAttrs.reversescale,
-    showscale: contourAttrs.showscale,
-
     autocontour: contourAttrs.autocontour,
     ncontours: contourAttrs.ncontours,
     contours: contourAttrs.contours,
@@ -42,4 +37,4 @@ module.exports = {
     _nestedModules: {
         'colorbar': 'Colorbar'
     }
-};
+});

src/traces/surface/attributes.js

@@ -6,14 +6,12 @@
 * LICENSE file in the root directory of this source tree.
 */
 
-
 'use strict';
 
 var Color = require('../../components/color');
 var colorscaleAttrs = require('../../components/colorscale/attributes');
 var extendFlat = require('../../lib/extend').extendFlat;
 
-
 function makeContourProjAttr(axLetter) {
     return {
         valType: 'boolean',
@@ -121,6 +119,7 @@ module.exports = {
         ].join(' ')
     },
 
+    // Todo this block has a structure of colorscale/attributes.js but with colorscale/color_attributes.js names
     cauto: colorscaleAttrs.zauto,
     cmin: colorscaleAttrs.zmin,
     cmax: colorscaleAttrs.zmax,