When the legend label options are not defined, no error should occur #4402
Conversation
This file contains 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
simonbrunel
reviewed
Jun 22, 2017
src/plugins/plugin.legend.js
Outdated
| var labelOpts = me.options.labels; | ||
| var legendItems = labelOpts.generateLabels.call(me, me.chart); | ||
| var labelOpts = me.options.labels || {}; | ||
| var legendItems = labelOpts.generateLabels ? labelOpts.generateLabels.call(me, me.chart) : []; |
There was a problem hiding this comment.
We could use helpers.callback here:
var items = helpers.callback(options.generateLabels, [me.chart], me) || [];There was a problem hiding this comment.
good call! Will make that change
There was a problem hiding this comment.
actually, turns out that that won't work because helpers.callback doesn't return the result of the callback.
There was a problem hiding this comment.
We could change the callback method to return the fn result:
callback: function(fn, args, thisArg) {
if (fn && typeof fn.call === 'function') {
return fn.apply(thisArg, args);
}
}There was a problem hiding this comment.
I'm ok with that. Will test out that change locally and see how it goes
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Resolves #4398