Rollback the optimization to skip colorbar layout

hy9be · hy9be · commit d7c47a0c66bc · 2017-04-17T17:47:19.000-04:00
diff --git a/src/plot_api/plot_api.js b/src/plot_api/plot_api.js
@@ -206,9 +206,7 @@ Plotly.plot = function(gd, data, layout, config) {
             if(trace.visible !== true || !trace._module.colorbar) {
                 Plots.autoMargin(gd, 'cb' + trace.uid);
             }
-            else if(Plots.traceIs(trace, 'markerColorscale') || Plots.traceIs(trace, 'parcoords') || Colorbar.hasColorbar(trace)) {
-                trace._module.colorbar(gd, cd);
-            }
+            else trace._module.colorbar(gd, cd);
         }
 
         Plots.doAutoMargin(gd);

Original file line number	Diff line number	Diff line change
`@@ -206,9 +206,7 @@ Plotly.plot = function(gd, data, layout, config) {`
`206`	`206`	`if(trace.visible !== true \|\| !trace._module.colorbar) {`
`207`	`207`	`Plots.autoMargin(gd, 'cb' + trace.uid);`
`208`	`208`	`}`
`209`		`- else if(Plots.traceIs(trace, 'markerColorscale') \|\| Plots.traceIs(trace, 'parcoords') \|\| Colorbar.hasColorbar(trace)) {`
`210`		`- trace._module.colorbar(gd, cd);`
`211`		`- }`
	`209`	`+ else trace._module.colorbar(gd, cd);`
`212`	`210`	`}`
`213`	`211`
`214`	`212`	`Plots.doAutoMargin(gd);`