Make sure x-axis labels don't overflow.

Fixes #63.
morrisjs · Jun 8, 2012 · acfec20 · acfec20
1 parent 0015b28
commit acfec20
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/morris.coffee b/morris.coffee
@@ -237,8 +237,10 @@ class Morris.Line
         .attr('font-size', @options.gridTextSize)
         .attr('fill', @options.gridTextColor)
       labelBox = label.getBBox()
-      # ensure a minimum of `xLabelMargin` pixels between labels
-      if prevLabelMargin is null or prevLabelMargin <= labelBox.x
+      # ensure a minimum of `xLabelMargin` pixels between labels, and ensure
+      # labels don't overflow the container
+      if (prevLabelMargin is null or prevLabelMargin <= labelBox.x) and
+          labelBox.x >= 0 and (labelBox.x + labelBox.width) < @el.width()
         prevLabelMargin = labelBox.x + labelBox.width + xLabelMargin
       else
         label.remove()

diff --git a/morris.js b/morris.js