morrisjs
diff --git a/‎examples/staked_bars.html‎
Lines changed: 30 additions & 0 deletions b/‎examples/staked_bars.html‎
Lines changed: 30 additions & 0 deletions
diff --git a/‎lib/morris.bar.coffee‎
Lines changed: 12 additions & 3 deletions b/‎lib/morris.bar.coffee‎
Lines changed: 12 additions & 3 deletions
diff --git a/‎morris.js‎
Lines changed: 14 additions & 4 deletions b/‎morris.js‎
Lines changed: 14 additions & 4 deletions
@@ -0,0 +1,30 @@
+<!doctype html>
+<head>
+  <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
+  <script src="https://raw.github.com/DmitryBaranovskiy/raphael/300aa589f5a0ba7fce667cd62c7cdda0bd5ad904/raphael-min.js"></script>
+  <script src="../morris.js"></script>
+  <script src="lib/prettify.js"></script>
+  <script src="lib/example.js"></script>
+  <link rel="stylesheet" href="lib/example.css">
+  <link rel="stylesheet" href="lib/prettify.css">
+</head>
+<body>
+<h1>Stacked Bars chart</h1>
+<div id="graph"></div>
+<pre id="code" class="prettyprint linenums">
+// Use Morris.Bar
+Morris.Bar({
+  element: 'graph',
+  data: [
+    {x: '2011 Q1', y: 3, z: 2, a: 3},
+    {x: '2011 Q2', y: 2, z: null, a: 1},
+    {x: '2011 Q3', y: 0, z: 2, a: 4},
+    {x: '2011 Q4', y: 2, z: 4, a: 3}
+  ],
+  xkey: 'x',
+  ykeys: ['y', 'z', 'a'],
+  labels: ['Y', 'Z', 'A'],
+  stacked: true
+});
+</pre>
+</body>
@@ -8,6 +8,7 @@ class Morris.Bar extends Morris.Grid
   # setup event handlers
   #
   init: ->
+    @cumulative = @options.stacked
     @prevHilight = null
     @el.mousemove (evt) =>
       @updateHilight evt.pageX
@@ -105,11 +106,12 @@ class Morris.Bar extends Morris.Grid
   # @private
   drawSeries: ->
     groupWidth = @width / @options.data.length
-    numBars = @options.ykeys.length
+    numBars = if @options.stacked? then 1 else @options.ykeys.length
     barWidth = (groupWidth * @options.barSizeRatio - @options.barGap * (numBars - 1)) / numBars
     leftPadding = groupWidth * (1 - @options.barSizeRatio) / 2
     zeroPos = if @ymin <= 0 and @ymax >= 0 then @transY(0) else null
     @bars = for row, idx in @data
+      lastTop = 0
       for ypos, sidx in row._y
         if ypos != null
           if zeroPos
@@ -118,10 +120,17 @@ class Morris.Bar extends Morris.Grid
           else
             top = ypos
             bottom = @bottom
-          left = @left + idx * groupWidth + leftPadding + sidx * (barWidth + @options.barGap)
-          @r.rect(left, top, barWidth, bottom - top)
+
+          left = @left + idx * groupWidth + leftPadding
+          left += sidx * (barWidth + @options.barGap) unless @options.stacked
+          size = bottom - top
+
+          top -= lastTop if @options.stacked
+          @r.rect(left, top, barWidth, size)
             .attr('fill', @colorFor(row, sidx, 'bar'))
             .attr('stroke-width', 0)
+
+          lastTop += size
         else
           null