mirror of
https://github.com/chartjs/Chart.js.git
synced 2024-10-06 04:09:08 +02:00
Options need to include dataset level defaults from main chart type (#8534)
This commit is contained in:
parent
d08eb147fc
commit
c040b8255e
@ -276,9 +276,11 @@ export default class Config {
|
|||||||
* @return {object[]}
|
* @return {object[]}
|
||||||
*/
|
*/
|
||||||
chartOptionScopes() {
|
chartOptionScopes() {
|
||||||
|
const controllerDefaults = defaults.controllers[this.type] || {};
|
||||||
return [
|
return [
|
||||||
this.options,
|
this.options,
|
||||||
defaults.controllers[this.type] || {},
|
controllerDefaults,
|
||||||
|
controllerDefaults.datasets || {},
|
||||||
{type: this.type},
|
{type: this.type},
|
||||||
defaults,
|
defaults,
|
||||||
defaults.descriptors
|
defaults.descriptors
|
||||||
|
@ -171,6 +171,17 @@ describe('Chart', function() {
|
|||||||
defaults.controllers.line.spanGaps = false;
|
defaults.controllers.line.spanGaps = false;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('should initialize config with default dataset options', function() {
|
||||||
|
var defaults = Chart.defaults.controllers.pie.datasets;
|
||||||
|
|
||||||
|
var chart = acquireChart({
|
||||||
|
type: 'pie'
|
||||||
|
});
|
||||||
|
|
||||||
|
var options = chart.options;
|
||||||
|
expect(options.circumference).toBe(defaults.circumference);
|
||||||
|
});
|
||||||
|
|
||||||
it('should override axis positions that are incorrect', function() {
|
it('should override axis positions that are incorrect', function() {
|
||||||
var chart = acquireChart({
|
var chart = acquireChart({
|
||||||
type: 'line',
|
type: 'line',
|
||||||
|
Loading…
Reference in New Issue
Block a user