581a dry colors - histogram2d, histogram2dcontour

Author: monfera

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'
     }
-};
+});