Fix broken unit test on colorbar

hy9be · hy9be · commit b7fda1cf6d9a · 2017-04-16T22:39:06.000-04:00
diff --git a/src/plot_api/plot_api.js b/src/plot_api/plot_api.js
@@ -206,7 +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') && Colorbar.hasColorbar(trace)) {
+            else if(Plots.traceIs(trace, 'markerColorscale') || Colorbar.hasColorbar(trace)) {
                 trace._module.colorbar(gd, cd);
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -206,7 +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') && Colorbar.hasColorbar(trace)) {`
	`209`	`+ else if(Plots.traceIs(trace, 'markerColorscale') \|\| Colorbar.hasColorbar(trace)) {`
`210`	`210`	`trace._module.colorbar(gd, cd);`
`211`	`211`	`}`
`212`	`212`	`}`