From d4bc462bf26f29ecf3a6cc849baf2eb071462af6 Mon Sep 17 00:00:00 2001 From: Ian Webster Date: Thu, 2 Jun 2022 15:52:44 -0700 Subject: [PATCH] Revert "Use default value when backgroundColor is undefined (#7950)" This reverts commit df942bb579be72619beb42e13720e9f325161ce4. --- src/controllers/controller.doughnut.js | 3 +-- src/controllers/controller.polarArea.js | 4 +--- src/plugins/plugin.legend.js | 3 +-- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/controllers/controller.doughnut.js b/src/controllers/controller.doughnut.js index 826227f958d..7cee5444457 100644 --- a/src/controllers/controller.doughnut.js +++ b/src/controllers/controller.doughnut.js @@ -25,7 +25,6 @@ defaults._set('doughnut', { var list = document.createElement('ul'); var data = chart.data; var datasets = data.datasets; - var globalDefaults = defaults.global; var labels = data.labels; var i, ilen, listItem, listItemSpan; @@ -34,7 +33,7 @@ defaults._set('doughnut', { for (i = 0, ilen = datasets[0].data.length; i < ilen; ++i) { listItem = list.appendChild(document.createElement('li')); listItemSpan = listItem.appendChild(document.createElement('span')); - listItemSpan.style.backgroundColor = valueOrDefault(datasets[0].backgroundColor[i], globalDefaults.defaultColor); + listItemSpan.style.backgroundColor = datasets[0].backgroundColor[i]; if (labels[i]) { listItem.appendChild(document.createTextNode(labels[i])); } diff --git a/src/controllers/controller.polarArea.js b/src/controllers/controller.polarArea.js index 7d73563cb64..d15ee9112f2 100644 --- a/src/controllers/controller.polarArea.js +++ b/src/controllers/controller.polarArea.js @@ -6,7 +6,6 @@ var elements = require('../elements/index'); var helpers = require('../helpers/index'); var resolve = helpers.options.resolve; -var valueOrDefault = helpers.valueOrDefault; defaults._set('polarArea', { scale: { @@ -36,7 +35,6 @@ defaults._set('polarArea', { var list = document.createElement('ul'); var data = chart.data; var datasets = data.datasets; - var globalDefaults = defaults.global; var labels = data.labels; var i, ilen, listItem, listItemSpan; @@ -45,7 +43,7 @@ defaults._set('polarArea', { for (i = 0, ilen = datasets[0].data.length; i < ilen; ++i) { listItem = list.appendChild(document.createElement('li')); listItemSpan = listItem.appendChild(document.createElement('span')); - listItemSpan.style.backgroundColor = valueOrDefault(datasets[0].backgroundColor[i], globalDefaults.defaultColor); + listItemSpan.style.backgroundColor = datasets[0].backgroundColor[i]; if (labels[i]) { listItem.appendChild(document.createTextNode(labels[i])); } diff --git a/src/plugins/plugin.legend.js b/src/plugins/plugin.legend.js index ac82faaa24d..e790e9ba43e 100644 --- a/src/plugins/plugin.legend.js +++ b/src/plugins/plugin.legend.js @@ -80,7 +80,6 @@ defaults._set('global', { legendCallback: function(chart) { var list = document.createElement('ul'); var datasets = chart.data.datasets; - var globalDefaults = defaults.global; var i, ilen, listItem, listItemSpan; list.setAttribute('class', chart.id + '-legend'); @@ -88,7 +87,7 @@ defaults._set('global', { for (i = 0, ilen = datasets.length; i < ilen; i++) { listItem = list.appendChild(document.createElement('li')); listItemSpan = listItem.appendChild(document.createElement('span')); - listItemSpan.style.backgroundColor = valueOrDefault(datasets[i].backgroundColor, globalDefaults.defaultColor); + listItemSpan.style.backgroundColor = datasets[i].backgroundColor; if (datasets[i].label) { listItem.appendChild(document.createTextNode(datasets[i].label)); }