Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix drawPoint parameters #6975

Merged
merged 1 commit into from
Jan 18, 2020
Merged

fix drawPoint parameters #6975

merged 1 commit into from
Jan 18, 2020

Conversation

touletan
Copy link
Contributor

@touletan touletan commented Jan 17, 2020

Legend plugin was not using the latest method signature for drawPoint which is (context, options, x, y). This has been fixed here, so usePointStyle parameter is now working again for legend.

benmccann
benmccann previously approved these changes Jan 17, 2020
Copy link
Contributor

@benmccann benmccann left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks for fixing!!

src/plugins/plugin.legend.js Outdated Show resolved Hide resolved
benmccann
benmccann previously approved these changes Jan 17, 2020
kurkle
kurkle previously approved these changes Jan 17, 2020
etimberg
etimberg previously approved these changes Jan 18, 2020
@etimberg etimberg added this to the Version 3.0 milestone Jan 18, 2020
@etimberg
Copy link
Member

Looks like the test failures may be real

@benmccann
Copy link
Contributor

I doubt the test failures are real because all the tests passed on GitHub Actions. I'll close and reopen to kick off Travis again. For reference, here are the errors:

Chrome 80.0.3987 (Linux 0.0.0) Core.Tooltip Should avoid tooltip truncation in x axis if there is enough space to show tooltip without truncation FAILED
Error: Timeout - Async function did not complete within 5000ms (set by jasmine.DEFAULT_TIMEOUT_INTERVAL)
at
Chrome 80.0.3987 (Linux 0.0.0) Core.Tooltip Should split newlines into separate lines in user callbacks FAILED
Error: Timeout - Async function did not complete within 5000ms (set by jasmine.DEFAULT_TIMEOUT_INTERVAL)
at

@benmccann benmccann closed this Jan 18, 2020
@benmccann benmccann reopened this Jan 18, 2020
@touletan touletan dismissed stale reviews from etimberg, kurkle, and benmccann via f89328b January 18, 2020 03:31
Copy link
Contributor

@benmccann benmccann left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

all tests passed this time

@etimberg etimberg merged commit 95345d0 into chartjs:master Jan 18, 2020
@touletan touletan deleted the bugfix-legend-pointstyle-draw branch January 20, 2020 01:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants