Skip to content

Commit acfec20

Browse files
committed
Make sure x-axis labels don't overflow.
Fixes #63.
1 parent 0015b28 commit acfec20

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

morris.coffee

+4-2
Original file line numberDiff line numberDiff line change
@@ -237,8 +237,10 @@ class Morris.Line
237237
.attr('font-size', @options.gridTextSize)
238238
.attr('fill', @options.gridTextColor)
239239
labelBox = label.getBBox()
240-
# ensure a minimum of `xLabelMargin` pixels between labels
241-
if prevLabelMargin is null or prevLabelMargin <= labelBox.x
240+
# ensure a minimum of `xLabelMargin` pixels between labels, and ensure
241+
# labels don't overflow the container
242+
if (prevLabelMargin is null or prevLabelMargin <= labelBox.x) and
243+
labelBox.x >= 0 and (labelBox.x + labelBox.width) < @el.width()
242244
prevLabelMargin = labelBox.x + labelBox.width + xLabelMargin
243245
else
244246
label.remove()

morris.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)