require colorbar draw method directly

etpinard · etpinard · commit 9e1732e8dd95 · 2015-12-18T15:31:46.000-05:00
diff --git a/src/traces/contour/colorbar.js b/src/traces/contour/colorbar.js
@@ -13,21 +13,21 @@ var d3 = require('d3');
 
 var Plotly = require('../../plotly');
 var getColorscale = require('../../components/colorscale/get_scale');
+var drawColorbar = require('../../components/colorbar/draw');
 
 
 module.exports = function colorbar(gd, cd) {
     var trace = cd[0].trace,
-        cbId = 'cb'+trace.uid;
+        cbId = 'cb' + trace.uid;
 
-    gd._fullLayout._infolayer.selectAll('.'+cbId).remove();
+    gd._fullLayout._infolayer.selectAll('.' + cbId).remove();
 
     if(trace.showscale===false){
         Plotly.Plots.autoMargin(gd, cbId);
         return;
     }
 
-    // instantiate the colorbar (will be drawn and styled in contour.style)
-    var cb = Plotly.Colorbar(gd, cbId);
+    var cb = drawColorbar(gd, cbId);
     cd[0].t.cb = cb;
 
     var contours = trace.contours,
diff --git a/src/traces/heatmap/colorbar.js b/src/traces/heatmap/colorbar.js
@@ -15,6 +15,8 @@ var isNumeric = require('fast-isnumeric');
 var Plotly = require('../../plotly');
 var Lib = require('../../lib');
 var getColorscale = require('../../components/colorscale/get_scale');
+var drawColorbar = require('../../components/colorbar/draw');
+
 
 module.exports = function colorbar(gd, cd) {
     var trace = cd[0].trace,
@@ -23,16 +25,17 @@ module.exports = function colorbar(gd, cd) {
         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);
+    if(!isNumeric(zmin)) zmin = Lib.aggNums(Math.min, null, trace.z);
+    if(!isNumeric(zmax)) zmax = Lib.aggNums(Math.max, null, trace.z);
+
+    gd._fullLayout._infolayer.selectAll('.' + cbId).remove();
 
-    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);
+    var cb = cd[0].t.cb = drawColorbar(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]; })))
diff --git a/src/traces/scatter/colorbar.js b/src/traces/scatter/colorbar.js
@@ -15,6 +15,7 @@ var isNumeric = require('fast-isnumeric');
 var Plotly = require('../../plotly');
 var Lib = require('../../lib');
 var getColorscale = require('../../components/colorscale/get_scale');
+var drawColorbar = require('../../components/colorbar/draw');
 
 
 module.exports = function colorbar(gd, cd) {
@@ -40,7 +41,7 @@ module.exports = function colorbar(gd, cd) {
     if(!isNumeric(cmin)) cmin = Plotly.Lib.aggNums(Math.min, null, vals);
     if(!isNumeric(cmax)) cmax = Plotly.Lib.aggNums(Math.max, null, vals);
 
-    var cb = cd[0].t.cb = Plotly.Colorbar(gd, cbId);
+    var cb = cd[0].t.cb = drawColorbar(gd, cbId);
 
     cb.fillcolor(d3.scale.linear()
             .domain(scl.map(function(v){ return cmin + v[0] * (cmax - cmin); }))
