mv traceColorbar from colorbar/ to heatmap/

 - similar to scatter colorbar

Author: etpinard

src/components/colorbar/index.js

@@ -575,29 +575,3 @@ colorbar.supplyDefaults = function(containerIn, containerOut, layout) {
     Plotly.Lib.coerceFont(coerce, 'titlefont', layout.font);
     coerce('titleside');
 };
-
-colorbar.traceColorbar = function(gd, cd) {
-    var trace = cd[0].trace,
-        cbId = 'cb' + trace.uid,
-        scl = Plotly.Colorscale.getScale(trace.colorscale),
-        zmin = trace.zmin,
-        zmax = trace.zmax;
-
-    if(!isNumeric(zmin)) zmin = Plotly.Lib.aggNums(Math.min, null, trace.z);
-    if(!isNumeric(zmax)) zmax = Plotly.Lib.aggNums(Math.max, null, trace.z);
-
-    gd._fullLayout._infolayer.selectAll('.'+cbId).remove();
-    if(!trace.showscale){
-        Plotly.Plots.autoMargin(gd, cbId);
-        return;
-    }
-
-    var cb = cd[0].t.cb = colorbar(gd, cbId);
-    cb.fillcolor(d3.scale.linear()
-            .domain(scl.map(function(v){ return zmin + v[0]*(zmax-zmin); }))
-            .range(scl.map(function(v){ return v[1]; })))
-        .filllevels({start: zmin, end: zmax, size: (zmax-zmin)/254})
-        .options(trace.colorbar)();
-
-    Plotly.Lib.markTime('done colorbar');
-};

src/traces/choropleth/index.js

@@ -26,7 +26,7 @@ Choropleth.attributes = require('./attributes');
 
 Choropleth.supplyDefaults = require('./defaults');
 
-Choropleth.colorbar = Plotly.Colorbar.traceColorbar;
+Choropleth.colorbar = require('../heatmap/colorbar');
 
 Choropleth.calc = function(gd, trace) {
 

src/traces/heatmap/colorbar.js

@@ -0,0 +1,42 @@
+/**
+* Copyright 2012-2015, Plotly, Inc.
+* All rights reserved.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*/
+
+
+'use strict';
+
+var d3 = require('d3');
+var isNumeric = require('fast-isnumeric');
+
+var Plotly = require('../../plotly');
+var Lib = require('../../lib');
+
+module.exports = function colorbar(gd, cd) {
+    var trace = cd[0].trace,
+        cbId = 'cb' + trace.uid,
+        scl = Plotly.Colorscale.getScale(trace.colorscale),
+        zmin = trace.zmin,
+        zmax = trace.zmax;
+
+    if(!isNumeric(zmin)) zmin = Plotly.Lib.aggNums(Math.min, null, trace.z);
+    if(!isNumeric(zmax)) zmax = Plotly.Lib.aggNums(Math.max, null, trace.z);
+
+    gd._fullLayout._infolayer.selectAll('.'+cbId).remove();
+    if(!trace.showscale){
+        Plotly.Plots.autoMargin(gd, cbId);
+        return;
+    }
+
+    var cb = cd[0].t.cb = Plotly.Colorbar(gd, cbId);
+    cb.fillcolor(d3.scale.linear()
+            .domain(scl.map(function(v){ return zmin + v[0]*(zmax-zmin); }))
+            .range(scl.map(function(v){ return v[1]; })))
+        .filllevels({start: zmin, end: zmax, size: (zmax-zmin)/254})
+        .options(trace.colorbar)();
+
+    Lib.markTime('done colorbar');
+};

src/traces/heatmap/index.js

@@ -46,7 +46,7 @@ exports.calc = require('./calc');
 
 exports.plot = require('./plot');
 
-exports.colorbar = Plotly.Colorbar.traceColorbar;
+exports.colorbar = require('./colorbar');
 
 exports.style = require('./style');
 

src/traces/mesh3d/index.js

@@ -28,4 +28,4 @@ Mesh3D.attributes = require('./attributes');
 
 Mesh3D.supplyDefaults = require('./defaults');
 
-Mesh3D.colorbar = Plotly.Colorbar.traceColorbar;
+Mesh3D.colorbar = require('../heatmap/colorbar');

src/traces/surface/index.js

@@ -30,7 +30,7 @@ Surface.attributes = require('./attributes');
 
 Surface.supplyDefaults = require('./defaults');
 
-Surface.colorbar = Plotly.Colorbar.traceColorbar;
+Surface.colorbar = require('../heatmap/colorbar');
 
 Surface.calc = function(gd, trace) {