Fix proposal for issue #18180

fix for when a series provide a x value https://bugs.dojotoolkit.org/ticket/18180
Tarrask · Jul 19, 2014 · d9fdd51 · d9fdd51
1 parent c82a1d1
commit d9fdd51
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/charting/plot2d/Candlesticks.js b/charting/plot2d/Candlesticks.js
@@ -65,7 +65,7 @@ define(["dojo/_base/lang", "dojo/_base/declare", "dojo/_base/array", "dojo/has",
 				if(!("ymin" in run) || !("ymax" in run)){
 					arr.forEach(run.data, function(val, idx){
 						if(val !== null){
-							var x = val.x || idx + 1;
+							var x = typeof val.x == "number" ? val.x : idx + 1;
 							stats.hmin = Math.min(stats.hmin, x);
 							stats.hmax = Math.max(stats.hmax, x);
 							stats.vmin = Math.min(stats.vmin, val.open, val.close, val.high, val.low);
@@ -143,7 +143,7 @@ define(["dojo/_base/lang", "dojo/_base/declare", "dojo/_base/array", "dojo/has",
 						var finalTheme = t.addMixin(theme, "candlestick", v, true);
 
 						//	calculate the points we need for OHLC
-						var x = ht(v.x || (j+0.5)) + offsets.l + gap,
+						var x = ht(typeof v.x == "number" ? v.x - 0.5 : j + 0.5) + offsets.l + gap,
 							y = dim.height - offsets.b,
 							open = vt(v.open),
 							close = vt(v.close),