From 6aa57ca30eff59778c3ea85491842c3c3d6e47d5 Mon Sep 17 00:00:00 2001 From: Jelte Fennema Date: Tue, 15 Jul 2014 14:57:37 +0200 Subject: [PATCH] Horizontal bar: Fix stacked and vertical grid --- lib/morris.bar.coffee | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/morris.bar.coffee b/lib/morris.bar.coffee index 66e8614..ba554c1 100644 --- a/lib/morris.bar.coffee +++ b/lib/morris.bar.coffee @@ -152,17 +152,22 @@ class Morris.Bar extends Morris.Grid size = bottom - top if @options.verticalGridCondition and @options.verticalGridCondition(row.x) - @drawBar(@left + idx * groupWidth, @top, groupWidth, Math.abs(@top - @bottom), @options.verticalGridColor, @options.verticalGridOpacity, @options.barRadius) + if not @options.horizontal + @drawBar(@xStart + idx * groupWidth, @yEnd, groupWidth, @ySize, @options.verticalGridColor, @options.verticalGridOpacity, @options.barRadius) + else + @drawBar(@yStart, @xStart + idx * groupWidth, @ySize, groupWidth, @options.verticalGridColor, @options.verticalGridOpacity, @options.barRadius) + top -= lastTop if @options.stacked if not @options.horizontal @drawBar(left, top, barWidth, size, @colorFor(row, sidx, 'bar'), @options.barOpacity, @options.barRadius) + lastTop += size else @drawBar(top, left, size, barWidth, @colorFor(row, sidx, 'bar'), @options.barOpacity, @options.barRadius) + lastTop -= size - lastTop += size else null