From d9fdd519ff716d7610df7a3a736268572cc99e51 Mon Sep 17 00:00:00 2001 From: Tarrask Date: Sat, 19 Jul 2014 16:03:03 +0200 Subject: [PATCH] Fix proposal for issue #18180 fix for when a series provide a x value https://bugs.dojotoolkit.org/ticket/18180 --- charting/plot2d/Candlesticks.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charting/plot2d/Candlesticks.js b/charting/plot2d/Candlesticks.js index e74e45f4c9..9bb00cf0b2 100644 --- 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),