Don't add padding when there's no last tick. #1200
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Flot 0.8 added logic to account for the size of axis tick labels and add padding around the edges of the plot, to prevent long labels from sticking out. But it padded both sides equally, which is incorrect if the right/top side has no last axis label. Fixed by allocating padding per-side, and checking whether the last label would be shown before padding the top or right. Fixes flot#1048.
dnschnur
added a commit
that referenced
this pull request
Nov 26, 2013
Don't add padding when there's no last tick.
dnschnur
added a commit
that referenced
this pull request
Nov 28, 2013
This was accidentally introduced by #1200; we can’t assume that axis.ticks is an array.
dnschnur
added a commit
to dnschnur/flot
that referenced
this pull request
Apr 20, 2014
The fix for an unnecessary gap on the right of the chart turned out to break text wrapping for ticks that were legitimately in that position. Fixes flot#1283.
| if (axis.reserveSpace && lastTick) { | ||
| if (axis.direction === "x") { | ||
| margins.left = Math.max(margins.left, axis.labelWidth / 2); | ||
| if (lastTick.v <= axis.max) { |
There was a problem hiding this comment.
Could you clarify what this check actually does? Why should we have ticks that are outside the axis?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Flot 0.8 added logic to account for the size of axis tick labels and add padding around the edges of the plot, to prevent long labels from sticking out. But it padded both sides equally, which is incorrect if the right/top side has no last axis label.
Fixed by allocating padding per-side, and checking whether the last label would be shown before padding the top or right. Fixes #1048.